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

Change-Id: Ie747d812296798d74d61bba4f9092ba0585b415d