Merge "defconfig: msm8610: Disable KSM"