Snap for 4502278 from b5145a4ef609a462a48e05640d0998271f48edf6 to pi-release

Change-Id: I9cdc0dd3e4aff25180292b8e011a5370f5b8ec3b
tree: 8a1b16b281347d43cc2e46aca6cbba1b0978bebc
  1. msm8998/
  2. Android.mk