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

Change-Id: Ica575e144ffef6a07619ea3fc346e35c29c13954
tree: 99da50ae5d314aa180a49f7b9d0daadb4b044f9d
  1. msm8998/
  2. Android.mk