Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  build.md: Correct in-tree test command

Change-Id: Ia55d49d39920e70e28485e220c46c66c1cfa0188