Added patch to fix the scope of "KANJI" in StringUtilUtf8