Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 6e9ae3c76d
am: b4af880d43

Change-Id: I9fa5174ebbf16c2eb364e421f888b6be4361054f
tree: 5aecc1d73a4887c2a1a935f4ec6efb676607e275
  1. msm8998/
  2. Android.mk
  3. CleanSpec.mk