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

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