Tool Labs: Add a couple requested packages

Bug: 58220
Bug: 55652
Change-Id: I52717f5da7c468e6693df80a63124a6048e76738