Merge 804dac6dc88cd959bb256bb1c19f74e351364da2 on remote branch

Change-Id: Ib0950ee784ca0008c07fccc0c8eadac8616d62cf
tree: 9566e0dbee7dc1d7ab956b4879f91e0ae2168c3c
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. proguard.flags