hostapd: update to latest trunk version (merge r26414, r26415)