am d0f2b7e7: Merge "More upstream NetBSD upgrades."

* commit 'd0f2b7e7e65f19f978c59abcbb522c08e76b1508':
  More upstream NetBSD upgrades.