Merge "Don't include <linux/socket.h> directly."