Merge "Add toolbox to vendor" am: ea4c7d5727 am: e575b4830c
am: dff7c03f59

Change-Id: Ic948ad609c834ac8e7d66418ea5c6cda3b66a8e3