Merge "Switch to OpenBSD <err.h> implementation."