Merge 4a5998c575a2209fcfb1b51fcbb2e9ee8bd9fed6 on remote branch

Change-Id: Ia1a065e4268089a57f9543ddee86fa0ff3914a2c
tree: 5270c25352e793bf49b0bfe3f53812f45dfe881a
  1. res/
  2. src/
  3. .gitignore
  4. Android.bp
  5. AndroidManifest.xml
  6. project.properties