Merge cdc2b2359406303ee41a283327eb3a28545168bf on remote branch

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