Merge "This code has moved to toybox proper."
am: c5dbd7134d

Change-Id: I653790cc381755645decbdfb2c57be0e61628b6e