am 0b584f2b: am f994458b: am b4b996a8: Merge "Include vendorsetup scripts in order"

* commit '0b584f2b394051684e2506cc7304b583df29bca6':
  Include vendorsetup scripts in order