Switch to upstream-freebsd for the unmolested wchar code.

Change-Id: I87b4d76ff8da04109ae53638eec4f11629798960
Merge "Switch to upstream-freebsd for the unmolested wchar code."
Merge remote-tracking branch 'aosp/master'