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

* commit 'f994458babc78670263085b027bfaa34ff0bc52a':
  Include vendorsetup scripts in order