Merge c707602a8c8c226ea67cfa20ac0e9415a8c1ab20 on remote branch

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