Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 7330b31178

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