Merge "wifi: move wpa_supplicant VINTF definition to wpa_supplicant module"