Merge "Clean up CMSG_*HDR in <sys/socket.h>"