am 31fa9604: Merge "toolbox: ls: 64 bit compile warnings"

* commit '31fa96047404496e902217b2d701b9ab4ac3a6f7':
  toolbox: ls: 64 bit compile warnings