Merge "This code has moved to toybox proper." am: c5dbd7134d am: 5f865e5943
am: 2256fe5a2a

Change-Id: I780f40883eeb377c18b161eb783cf9f1e5f0714e