Merge "defconfig: msm8937: Enable VTI config for v4 and v6"