Merge "Remove SIOCKILLADDR from <sys/socket.h>."