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

* upstream/master:
  Fix bug in buildPropertyMap in previous commit.
  Fix missing dependencies from mutators

Test: 'm nothing' runs internal tests
Change-Id: Id1b9ae002e62351a8ec0d27c249ca25ef949ff5f
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