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