Merge remote-tracking branch 'aosp/upstream' into master

* aosp/upstream:
  Revert "Put the primary builder into the console pool"
  Fix/improve comments on prepending/appending props

Fixes: 137593206
Test: m checkbuild
Change-Id: Ibed0bfa25cc26fd4382772e93ae6ddf07ab3d9fc