Merge "Fix ioctl FIONREAD call parameters to use int instead of size_t"