Update from https://crrev.com/314320

net/base/net_string_util_icu_alternatives_android.cc

Index: net/base/net_string_util_icu_alternatives_android.cc
diff --git a/net/base/net_string_util_icu_alternatives_android.cc b/net/base/net_string_util_icu_alternatives_android.cc
index f4ef1efc81a12c4f4002bf4f78bea4f2a8bde283..0551a03c565a883aecbbc7728e12dceea0e3549f 100644
--- a/net/base/net_string_util_icu_alternatives_android.cc
+++ b/net/base/net_string_util_icu_alternatives_android.cc
@@ -66,7 +66,9 @@ ScopedJavaLocalRef<jstring> ConvertToJstringWithSubstitutions(
 
 }  // namespace
 
-const char kCharsetLatin1[] = "ISO-8859-1";
+// This constant cannot be defined as const char[] because it is initialized
+// by base::kCodepageLatin1 (which is const char[]) in net_string_util_icu.cc.
+const char* const kCharsetLatin1 = "ISO-8859-1";
 
 bool ConvertToUtf8(const std::string& text, const char* charset,
                    std::string* output) {