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

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