am 3e46f4af: am 9c39510e: am c2d9cc85: Merge "toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)"

* commit '3e46f4af4f52aee324601b449abf9219bfd6b362':
  toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)