Snap for 4793185 from 0baec72ee58ed4ce18c00b094ea85726d264707d to pi-release

Change-Id: I7750f429d021d237b7b9d1120edbb77e2625f060
tree: 6abe6701a25898b173e9685ce6fe624e37b87514
  1. msm8998/
  2. Android.mk