Snap for 4557233 from 8a33ca28a70cf7f9594553ad2342c997b9a0a4b1 to pi-release

Change-Id: I07e8ee8460860c56c8843de2a7d07216e1aac922
tree: b5ae40a75e056d5e6eeacee9a5e442b65b477bb1
  1. msm8998/
  2. Android.mk