Merge "toolbox: Fixed type mismatch for ioctl(BLKGETSIZE)"