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

* aosp/upstream:
  Do not rewrite dependencies on implicit outputs to be the primary output

Test: make test
Change-Id: I787cc8f5c39902cebb257ad7dab0fe0ff608aa9c
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..d480f59
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,3 @@
+ccross@android.com
+dwillemsen@google.com
+hamaji@google.com