Revert Use AOSP version of wpa_supplicant_lib