Merge "Remove libcore_util_CharsetUtils.cpp"