master: remove core-admin, add toolbox

Change-Id: Id2c90763c55c158ae28bc51fcfa2789656c4f233