Merge 655d05f4c4f69db91718f7b94f6b0986bbb59267 on remote branch

Change-Id: If3cbcd8f8a829dbfd684be45b20e34528c59a4ef
tree: 117c166f963b7ffe7ff7161cb61f3c2778bf5afe
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS