Tool Labs: Add missing packages for tools

Change-Id: I5f1d6b41e9d51f43e1de826a1d3fc9b8dca28ce7