Merge "Add toolbox to vendor"
am: ea4c7d5727

Change-Id: I62f3796b693faa5c1bc8dfb70c04a176fa3611f6