Merge 8bc45356eb82fc4002c7a2d5a82667b094074765 on remote branch

Change-Id: I371a6a4e74ae41f6e4b42b995e6b2d0fc0f604d9
tree: 642246554324abac95205c2f27a6f429af71a6eb
  1. src/
  2. Android.bp
  3. AndroidManifest.xml
  4. OWNERS