Merge 2e30b0569c7722ec64c38d8a86e6ce194d975ac5 on remote branch

Change-Id: I5276a96387591afa8685586fec39e885df78e5b7
tree: 80eb29d4c10140e6cba36931489f8f2ca8f0345e
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. PREUPLOAD.cfg