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

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