Merge 40245d6e201c76641175ac816e6673a89df5c380 on remote branch

Change-Id: I374739719955c6c1dab71d4b77087513d9830862
tree: 5870dd8bf69841b1bc5b8f88e18764f79743864f
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS