Merge "Add NETLINK_INET_DIAG constant"