Merge \\\\"Move dumpstate over to toybox top.\\\\" am: f5e4ac0338 am: 0498cc9683 am: 41a67e15dd
am: 66e84e18c0

Change-Id: I05c52ecdfb853c19f0c4934200cddb30838e9e33