Merge "defconfig: 8974: Enable cache error reporting" into msm-3.4