am e1047515: am f72c56d6: Merge "Switch to upstream NetBSD nsap_addr.c."

* commit 'e104751566da6e8ef340926781d5ef120bf1d801':
  Switch to upstream NetBSD nsap_addr.c.