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

Change-Id: I7d02698ab51c4b8d3afbfd2b87ed7d4f4e1c88ad
tree: 3b22dfc8ae6cd9843b518ae65c218750bb94c230
  1. res/
  2. src/
  3. tests/
  4. tools/
  5. Android.mk
  6. AndroidManifest.xml
  7. CleanSpec.mk