Merge QPR1.180718.001

Change-Id: I403032230f0185a843139026a5826e3a8b4996b9
diff --git a/OWNERS b/OWNERS
index 562dea0..4c3d344 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,6 +1,3 @@
-per-file Android.bp = build.master@android.com
-
+codewiz@google.com
 ek@google.com
-hugobenichi@google.com
 lorenzo@google.com
-pauljensen@google.com