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

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