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

* commit 'fd0f4d9ad6e37d8047767e7e1ce9374906a3acc8':
  toolbox: ls: 64 bit compile warnings