Merge "nl80211: Change the sequence of NL attributes." into msm-3.0