Merge "Clean up InputChannel file descriptor data type."