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

Change-Id: I6ec224b6636689e509147c2e31ece1486fe4d443
tree: c6dd34eb35081cc9fde8c6ffe7f3d2203475d3ae
  1. msm8998/
  2. Android.mk
  3. CleanSpec.mk