Merge "[wpa_supplicant] Revert patch b686745c from wpa_ctrl.c"