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

Change-Id: If3617ec02ea07536a3a1c8285ee6503b5d2ec8a4