Android: Enable feed and multidex.

chrome_modern_public_apk and chrome_public_apk hit the single dex
method limit when feed is enabled. This CL re-enables feed while also
turning on multidex for the required APKs.

Binary-Size: Feed was disabled to fix the multidex method limit issue.
Bug: 901488
Change-Id: Ifba41178fad6c206ec1f458d420187ef1c2eb6f3
Reviewed-on: https://chromium-review.googlesource.com/c/1327403
Commit-Queue: Eric Stevenson <estevenson@chromium.org>
Reviewed-by: Sky Malice <skym@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606670}

chrome/android/BUILD.gn

@@ -1464,6 +1464,9 @@ template("chrome_public_apk_or_module_tmpl") {
     load_library_from_apk = _is_modern && chromium_linker_supported
 
     version_name = chrome_version_name
+    if (experimental_r8_path == "") {
+      enable_multidex = true
+    }
   }
 }
 

chrome/android/monochrome/scripts/monochrome_apk_checker.py

@@ -53,6 +53,7 @@ CHROME_CHANGES = BuildFileMatchRegex(
     r'AndroidManifest\.xml',
     r'resources\.arsc',
     r'classes\.dex',
+    r'classes2\.dex',
     r'res/.*\.xml', # Resource id isn't same
     r'assets/unwind_cfi_32', # Generated from apk's shared library
      # All pak files except chrome_100_percent.pak are different

components/feed/features.gni

@@ -3,7 +3,5 @@
 # found in the LICENSE file.
 
 declare_args() {
-  # TODO(agrieve): Set this back to "is_android" once
-  # https://crbug.com/901488 is fixed
-  enable_feed_in_chrome = false
+  enable_feed_in_chrome = is_android
 }