Merge "We don't need WPA_SUPPLICANT_VERSION in generic build."