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

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