Merge remote-tracking branch 'aosp/upstream'

* aosp/upstream:
  Add ReplaceDependeciesIf to allow for conditional replacement

Test: m checkbuild
Change-Id: Iff96881da42c7ea3c3594d2ff2451215c38c4cdc
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