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

Change-Id: I8924f6957f5371f0d4dd9278d172224dc1d9c419
tree: 4fd31ff1308c1d6bbb30819b7821f73e4c02a4f1
  1. src/
  2. Android.mk