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