Merge "Revert "Switch to toybox ls.""