[backfire] merge hostapd fix from r21065