Merge "fs_config: wifi is now on vendor partition"