Merge "Update OWNERS file" am: 166727a97b am: a1227d4b0f

Change-Id: I1036f5ba69d0c3ab4fa51c1926159c86da87c5ad
tree: d9e98023fef26d36d84daba1402f27b6b24ad28b
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS