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

* commit '8b8974ef566599aebfc4d8614bc8d18ecffad652':
  toolbox: ls: 64 bit compile warnings