Merge bc3745589b50b9c24966b458bbd138cc0134f8e6 on remote branch

Change-Id: I789005f7b2e9b89fe0d3ae0887b03f6896ab7058
tree: 0e3d372b36f4960d9a26fa32790ab9df8219f22e
  1. src/
  2. Android.bp
  3. AndroidManifest.xml
  4. OWNERS