Merge "Add toolbox to vendor partition" am: 1d2c3f4406 am: 9cb71cc931
am: 7b271ce4fd

Change-Id: I01c4b4e966eae6e15f05997c2f1404db70df6f92