Merge 1dc81cb7763c4c9f7731e80866f938ef99e67c1a on remote branch

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