Merge "defconfig: msm8610: Use correct csi and ispif version"