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

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