Merge 1a4258a37c16395648c96b3436afbf64252066e0 on remote branch

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