Merge "Switch to upstream NetBSD tdelete/tfind/tsearch."