Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: I780971ba452746c4745025fcfa58203922d3d87f