Merge "Lose dd to toybox."
am: b1677c15c2

Change-Id: Idc91fde82512826860288840449d85e63e6a725b