Merge wpa_supplicant and hostapd driver wrapper implementations