Snap for 5234541 from a954a762119a90b84fbb2cc7cfb493ad41a139a8 to sdk-release

Change-Id: I2582866c71db622b53c3d25cd0b2af80a5fb76c7
tree: 99da50ae5d314aa180a49f7b9d0daadb4b044f9d
  1. msm8998/
  2. Android.mk