Merge "Switch to upstream NetBSD nsap_addr.c."