Snap for 4396682 from fca26c3c4834dacaed51e6dd4adcdf7260b04c6e to pi-release

Change-Id: I129eb4d60762f143c3ebce7388e8bdb8a746d87e
tree: cacb79087cb949b56478519224737573dbc4ad4d
  1. msm8998/
  2. Android.mk