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

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