Merge "defconfig: msm8610: add VPN support for msm8610"