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
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..5dca797
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,4 @@
+asmundak@google.com
+ccross@android.com
+dwillemsen@google.com
+jungjw@google.com