Snap for 4402310 from c6b4664ae094b5927f3c89465848dc4dd3b6ccbd to oc-m2-release

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