Merge stage-aosp-master to aosp-master - DO NOT MERGE am: e434d5c5e4

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