Revert "msm8974: Update WCNSS configuration"

The new version has issues with P2P GO negotiation and sessions,
so back off for now

This reverts commit 928d2b4236af36c6066ac9fde9002578ce54e0d7.

Change-Id: Iff2695f7ff77835c24fced8c2377480d008f3201
Merge branch 'cm-11.0' into kk_mkt