Merge \"No need for dumpstate to explicitly reference \'toybox\'...\"
am: c1c06a7d6b

Change-Id: Icb2f2ba9cd42e7f3c209d2f7b9e14ec8443a9a16