Merge b83dce2370ea88f3cf723f05195f6d4d7a621b62 on remote branch

Change-Id: Ic702ebb0cc0593ed713c7930143c027d4d7fdcfc
tree: df634909f12926560cd3ec44e69d7dbabfbf886a
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml