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

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