Fixed build failures caused by changes in 3f623f.
Fixed more build failures.
Updated toybox.