Merge "Confine hostapd, but leave it permissive for now."