Merge "Fix ioctl FIONREAD call parameters to use int instead of size_t" am: b17cdb26df am: 7e1af2dd40

Change-Id: I05410938bc94fb40a9a57f297eb52d487fc2daca