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

Change-Id: I2e6660414f672d37f626b4972c2426f670a73bf8
tree: 6abe6701a25898b173e9685ce6fe624e37b87514
  1. msm8998/
  2. Android.mk