am 917b455e: Merge "Revert "Switch to toybox ls.""

* commit '917b455ee78949701d2ee0ec72d9cdb44329d028':
  Revert "Switch to toybox ls."