Merge bbdfd137f37f3594eb6a8265401a219385a4718e on remote branch

Change-Id: I6f64501d7d248c6819ed842e4e55f23f52e646e7
tree: c306553fa060447c488a8735e9c6d0fe6e3cfd8a
  1. src/
  2. Android.bp
  3. AndroidManifest.xml
  4. OWNERS