Merge remote-tracking branch 'aosp/upstream'

* aosp/upstream:
  Add --empty-ninja-file for test usecases

Test: m blueprint_tools
Test: build/soong/build_test.bash
Change-Id: Ia6a5aec00059f165f06fc29446cb4bf7ca410812
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..89b446a
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,2 @@
+ccross@android.com
+dwillemsen@google.com