Merge "vold: fix 64 bit ioctl error"