Merge "Add toolbox to vendor partition"