Snap for 4437123 from 25fe53308de34c59e48652551c320f4ea1c51e2e to pi-release

Change-Id: I6beae3bca08026443c5bb7dda21b9d2b93d96321
tree: 0525a31ae05b46b580f350a806d3bd7a22dbd4af
  1. msm8998/
  2. Android.mk