Ensure we use the current locale when looking up fallback fonts per character

src/ports/SkFontConfigParser_android.cpp

 /*
  * Copyright 2011 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontConfigParser_android.h"
 #include "SkTDArray.h"
 #include "SkTypeface.h"
@@ skipping 236 matching lines @@
     // Append all fallback fonts to system fonts
     for (int i = 0; i < fallbackFonts.count(); ++i) {
         fallbackFonts[i]->fIsFallbackFont = true;
         *fontFamilies.append() = fallbackFonts[i];
     }
 }
 
 /**
  * Read the persistent locale.
  */
-void SkFontConfigParser::GetLocale(AndroidLocale &locale)
+SkString SkFontConfigParser::GetLocale()
 {
     char propLang[PROP_VALUE_MAX], propRegn[PROP_VALUE_MAX];
     __system_property_get("persist.sys.language", propLang);
     __system_property_get("persist.sys.country", propRegn);
 
     if (*propLang == 0 && *propRegn == 0) {
         /* Set to ro properties, default is en_US */
         __system_property_get("ro.product.locale.language", propLang);
         __system_property_get("ro.product.locale.region", propRegn);
         if (*propLang == 0 && *propRegn == 0) {
             strcpy(propLang, "en");
             strcpy(propRegn, "US");
         }
     }
-    strncpy(locale.language, propLang, 2);
-    locale.language[2] = '\0';
-    strncpy(locale.region, propRegn, 2);
-    locale.region[2] = '\0';
+
+    SkString locale(6);
+    char* localeCStr = locale.writable_str();
+
+    strncpy(localeCStr, propLang, 2);
+    localeCStr[2] = '-';
+    strncpy(&localeCStr[3], propRegn, 2);
+    localeCStr[5] = '\0';
+
+    return locale;
 }