Merge "msm8226: Change kernel defconfig to refer to msm8610"