Merge "No need for dumpstate to explicitly reference 'toybox'..."