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

Change-Id: I72271061a979eb51cd86b27b5bca5adc575334bb
tree: 97cd734f960bfdac84884909da00cc46159b83de
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml