Snap for 4448085 from c6b4664ae094b5927f3c89465848dc4dd3b6ccbd to oc-m3-release

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