Merge 64d388993bd2a03990c3975ecf5baca1c37d0bed on remote branch

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