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

Change-Id: I4d85c716c6d3a0a23d4b35df5707195abba3c6f2