Merge "defconfig: 8960: Enable stack protector" into msm-3.0