DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I92beebd26ed0a0697904cc7b984464b2ef28e6f9
tree: 99da50ae5d314aa180a49f7b9d0daadb4b044f9d
  1. Android.mk
  2. msm8998/