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

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