Merge "defconfig: Add changes to build cfg80211 as module" into msm-3.0