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

Change-Id: Ife4326923f368479844b3067250163c85c2cafd7