Merge "defconfig: msm8660: Update debug defconfig" into msm-3.0