Merge "Fixed type mismatch for ioctl(BLKGETSIZE)"