Merge "Backwards and forwards compatibility for an upcoming <sys/socket.h> change."