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

src/ports/SkFontConfigParser_android.h

 /*
  * 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.
  */
 
 #ifndef SKFONTCONFIGPARSER_ANDROID_H_
 #define SKFONTCONFIGPARSER_ANDROID_H_
 
 #include "SkTypes.h"
 
 #include "SkPaintOptionsAndroid.h"
+#include "SkString.h"
 #include "SkTDArray.h"
 
 struct FontFileInfo {
     FontFileInfo() : fFileName(NULL) {}
 
     const char*           fFileName;
     SkPaintOptionsAndroid fPaintOptions;
 };
 
 /**
@@ skipping 22 matching lines @@
 void GetFontFamilies(SkTDArray<FontFamily*> &fontFamilies);
 
 /**
  * Parses all test font configuration files and returns the results in an
  * array of FontFamily structures.
  */
 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
 
 #endif /* SKFONTCONFIGPARSER_ANDROID_H_ */