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

Change-Id: I13a98c81ed7424ee483f4c33677aed5c3e563fc8