am b4b996a8: Merge "Include vendorsetup scripts in order"

* commit 'b4b996a8ee26553e29f7610f97041753ddff3e68':
  Include vendorsetup scripts in order