am cf9a9604: Merge "Switch to upstream-freebsd for the unmolested wchar code."

* commit 'cf9a9604adb27600c79ca236578a8be89168202f':
  Switch to upstream-freebsd for the unmolested wchar code.