Merge f6637a755a74a6f0b72e6219e584239b6038f1c2 on remote branch

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