Merge f744990234beac18862cfd56aa3689bbee220f38 on remote branch

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