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

Change-Id: I9fedaa6f1208098afef24517c3c82f3d31983f59