Snap for 4496165 from fbc8aaa3bf56d3be40d12bb4cf97540bc9dc6697 to pi-release

Change-Id: I9cf673942851609a582bd2f1c8bd86ad21a2a00d
tree: 0525a31ae05b46b580f350a806d3bd7a22dbd4af
  1. msm8998/
  2. Android.mk