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

Change-Id: Ia47c5f257f1552e711705bcb974c068c201382ba