Merge "More upstream NetBSD upgrades."