Merge a09378faa73ed0e991f8ac0a146e4947e54af392 on remote branch

Change-Id: I1ac61acb2b687286265cbe3452f6166d1cc5b3ef
tree: 01f2a12f9edafc0c24fab9c5805fb8930e7999d4
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg