Merge bc9d23d26fe9581167021334a3903718f7587c13 on remote branch

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