Merge "defconfig: msm8960: Enable reporting L2 master port errors" into msm-3.0