Merge 9abbff28ed8b6395e6a0f970622d29f2cdf670ec on remote branch

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