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