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

Change-Id: Ief55b778d10fd73f7bda173a1460de24971a4a4c