Merge "defconfig: msm: Enable KSM for msm8610"