Merge "defconfig: 8974: enable coresight drivers" into msm-3.4