Merge "Add missing arpa/inet.h include for ntohl."