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

* commit '1ec2d1d297cd7ad60a88da9a0b53f2ef3c37f26d':
  Revert "Switch to toybox ls."