Merge efa441a81ee1e2117de01fdb14bf60ced1322d4a on remote branch

Change-Id: I3d08f8a3b3419ef5b390a3cadc909d4ec42f6f37
tree: 2e77e435fa19de9e27f8b4fffb51a7de47e5c5ff
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS