Merge "defconfig: wcnss: Enable wcnss support for 8974" into msm-3.4