Merge c42cb70016a4eb52f9838ea4da808f7bd319d139 on remote branch

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