Merge \"Move dumpstate over to toybox top.\"
am: f5e4ac0338

Change-Id: Ib6fb7d2c0b7f5507b02dcd160cb0a24ab8ac1558