Upgrade toybox to 61edf7ca9141647935c3cb49da9b2d712d69b152

Test: make
Bug: 211570674
Bug: 195477363
Change-Id: I21b4764ef516fe0c3d680f8367b0f0fdc0206a80