Merge "Remove vendorsetup.sh creation"
am: 90cb78a769

Change-Id: I444d9c47baf8aecd4dbe64f917051ec2c60d8ae1