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

* commit 'e74a84ba89478e0c002adc181ec86d31d584373c':
  Revert "Switch to toybox ls."