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

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