Merge bea935fd298a58b3a244dc4b61239364d812c198 on remote branch

Change-Id: If10a0457ffc6727cda851ea11210ec47233e73e4
tree: 92593902843e22d480301c354dd93571b7a6336f
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS