Merge "Lose dd to toybox." am: b1677c15c2
am: b1281967aa

Change-Id: I8f03aeb6951bf8e5cb021608977bec53dbbab65d