msm8930: Merge in some wifi config changes from stock KK

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