[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: 412b5a06f9  -s ours

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