Merge "Use -Werror in external/wpa_supplicant_8/hostapd" am: 7d7bc6ae84
am: 55ec026970

Change-Id: I196ef5d894fc3ad4c638674f54d61bd9038d159e