Snap for 4384531 from 923f17dd3cacbed3deb293c1a1831d4f4e1b0813 to oc-m2-release

Change-Id: I468bd281419a443a66a5391ad9337ef5e54f7cb6
tree: b0f0fce16acc1d7e54faeb786441a6ae8c1c4eb0
  1. msm8998/
  2. Android.mk