Merge "ipacm: fix the VTS error" into oc-mr1-dev am: 0777ebbf64
am: 78c15c0260

Change-Id: I83b4e4cb05055d549992d73b78b2fd3611be2a3d
tree: 8673680814bafe922c07f49f4901677491d745ab
  1. msm8998/
  2. Android.mk