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

src/ports/SkFontConfigParser_android.h

Index: src/ports/SkFontConfigParser_android.h
diff --git a/src/ports/SkFontConfigParser_android.h b/src/ports/SkFontConfigParser_android.h
index c5cd3eb8b7390cbdd5214cf52af4a4803d269d96..fd64496f774fe1f9f0851a2fa10f3b0dd5918064 100644
--- a/src/ports/SkFontConfigParser_android.h
+++ b/src/ports/SkFontConfigParser_android.h
@@ -11,6 +11,7 @@
 #include "SkTypes.h"
 
 #include "SkPaintOptionsAndroid.h"
+#include "SkString.h"
 #include "SkTDArray.h"
 
 struct FontFileInfo {
@@ -53,12 +54,7 @@ void GetTestFontFamilies(SkTDArray<FontFamily*> &fontFamilies,
                          const char* testMainConfigFile,
                          const char* testFallbackConfigFile);
 
-struct AndroidLocale {
-    char language[3];
-    char region[3];
-};
-
-void GetLocale(AndroidLocale &locale);
+SkString GetLocale();
 
 } // SkFontConfigParser namespace