Merge "Revert "fs_config: Move hostapd to /vendor/bin/hw"" into pi-dev