Use BCP47 compliant format for locale representation

base/android/java/src/org/chromium/base/ResourceExtractor.java

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.base;
 
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.AsyncTask;
@@ skipping 155 matching lines @@
     private static ResourceExtractor sInstance;
 
     public static ResourceExtractor get() {
         if (sInstance == null) {
             sInstance = new ResourceExtractor();
         }
         return sInstance;
     }
 
     private static String[] detectFilesToExtract() {
-        String language = LocaleUtils.getLanguage(Locale.getDefault());
+        String language = LocaleUtils.getLocaleLanguage(Locale.getDefault());
         // Currenty (Oct 2016), this array can be as big as 4 entries, so using a capacity
         // that allows a bit of growth, but is still in the right ballpark..
         ArrayList<String> activeLocalePakFiles = new ArrayList<String>(6);
         for (String locale : BuildConfig.COMPRESSED_LOCALES) {
             if (locale.startsWith(language)) {
                 activeLocalePakFiles.add(locale + ".pak");
             }
         }
         return activeLocalePakFiles.toArray(new String[activeLocalePakFiles.size()]);
     }
@@ skipping 119 matching lines @@
         }
     }
 
     /**
      * Pak extraction not necessarily required by the embedder.
      */
     private static boolean shouldSkipPakExtraction() {
         return get().mAssetsToExtract.length == 0;
     }
 }