Remove extra vendorsetup

Change-Id: I501e4bf9d50c5cccaec4eb9dfbd1ea5070cfae83