Move ChromiumMultiDex to BuildConfig.

base/BUILD.gn

Index: base/BUILD.gn
diff --git a/base/BUILD.gn b/base/BUILD.gn
index ce8089159ad067f707944dd209ec98bd9426296d..f6e2e72c08238ce819bd165d284d25099b7107e7 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1991,7 +1991,7 @@ if (is_android) {
   android_library("base_java") {
     srcjar_deps = [
       ":base_android_java_enums_srcjar",
-      ":base_multidex_gen",
+      ":base_build_config_gen",
       ":base_native_libraries_gen",
     ]
 
@@ -2002,10 +2002,10 @@ if (is_android) {
 
     DEPRECATED_java_in_dir = "android/java/src"
 
-    # New versions of ChromiumMultiDex.java and NativeLibraries.java
+    # New versions of BuildConfig.java and NativeLibraries.java
     # (with the actual correct values) will be created when creating an apk.
     jar_excluded_patterns = [
-      "*/ChromiumMultiDex.class",
+      "*/BuildConfig.class",
       "*/NativeLibraries.class",
       "*/NativeLibraries##*.class",
     ]
@@ -2040,7 +2040,7 @@ if (is_android) {
       "//third_party/robolectric:android-all-4.3_r2-robolectric-0",
       "//third_party/robolectric:robolectric_java",
     ]
-    srcjar_deps = [ ":base_multidex_gen" ]
+    srcjar_deps = [ ":base_build_config_gen" ]
   }
 
   # GYP: //base.gyp:base_junit_tests
@@ -2070,12 +2070,12 @@ if (is_android) {
     ]
   }
 
-  # GYP: //base/base.gyp:base_multidex_gen
-  java_cpp_template("base_multidex_gen") {
+  # GYP: //base/base.gyp:base_build_config_gen
+  java_cpp_template("base_build_config_gen") {
     sources = [
-      "android/java/templates/ChromiumMultiDex.template",
+      "android/java/templates/BuildConfig.template",
     ]
-    package_name = "org/chromium/base/multidex"
+    package_name = "org/chromium/base"
   }
 
   # GYP: //base/base.gyp:base_native_libraries_gen