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

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