Merge "Prepares hostapd for use by a wifi HAL vendor APEX"