Merge "Revert "Use -Werror in external/wpa_supplicant_8""