Merge "defconfig: sdxpoorwills: Make CFG80211 options same as -perf" into msm-4.9