Merge "Fix socklen_t (on LP64 only)."