Merge d201d611eb3af2ec43457daf30802ed014e44e44 on remote branch

Change-Id: I2355ebc72d41f56084ecec778795591dd8fd2184
tree: 35153543e1c2622043516acd3fe45de20447ee41
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS