DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: Ie9a85fba2a7104182c5396751e85f44afdcd378e
tree: ce728a56e46ff1db11aa38ef1496d82122ff7fa3
  1. msm8974/
  2. msm8996/
  3. msm8998/
  4. Android.mk
  5. CleanSpec.mk