Merge e12728f01ee1e5dd3f7d3816afaabb7359ff94fd on remote branch

Change-Id: Ib063788abc5e6afd9d79e4f7ff729634d0b50431
tree: 99a74651440e8073e977a0e4c9efa32777f1856d
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS