Merge "Match _Nonnull between char and wchar_t funcs."