Merge 725e4d484f24c8069c11233b68f0aabce5a38490 on remote branch

Change-Id: I4f95c77bc69deb8b493564577357046b6480cd65
tree: 001ca3325570e7430db5cfb8b37a85311491155f
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS