Merge "fs_config: Move hostapd to vendor partition"