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

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