am e3dbe1e3: Merge "Upgrade more functions to the current upstream NetBSD copy."

* commit 'e3dbe1e3820d6ab0370566055e9cdc593c5cce48':
  Upgrade more functions to the current upstream NetBSD copy.