Merge "Remove vendorsetup.sh creation"