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

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