Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 76e63b0e31

Change-Id: Ia52ad1b9d480efa6089d9c2ca3198969d356fbb1
tree: 72b5e02633c3fc4f70c4c682dc85a033fbf4a571
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags