am ed36d95f: Merge "Start moving to current FreeBSD stdio."

* commit 'ed36d95fac5881f78a601e2932f51edfd27c6ba6':
  Start moving to current FreeBSD stdio.