am 3ede900b: Merge "Revert "Revert "Switch to NetBSD\'s strxfrm(3)."""

* commit '3ede900b644c2a7c2fa41177b81735c8a09bd14a':
  Revert "Revert "Switch to NetBSD's strxfrm(3).""