Merge f7f208ce0a26e6d975bf4648d7898593d4a18dbd on remote branch

Change-Id: I969976ef1c0aef9b7aa50de7588ab3e106a3192e
tree: 61781ee2ad2793370ccdff4c9b9b65ff427773d4
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS