Merge "Convert toolbox to Android.bp" am: 603826f857
am: 0b3e2d4499

Change-Id: I28228d67c0bfa0ed815b18227e706958b79bdbb2