Merge "Revert "Revert "Switch to NetBSD's strxfrm(3)."""