Merge pi-platform-release to stage-aosp-master - DO NOT MERGE

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