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

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