Merge a62c3c7211310eace71f11bb341b31422c5dd07c on remote branch

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