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

Change-Id: Id8dad48e5fe42e8671bf2ceb1fcdbc28cb087ffc