[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 99b07270cb  -s ours
am: 9721aa0d9a  -s ours

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