Extend the multidex logic to only kick in for the main browser application.

chrome/android/java/AndroidManifest.xml

Index: chrome/android/java/AndroidManifest.xml
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index 30c1bf0b61e9177bca149927e38878ef4b05fd69..9ada53977a148dcac8eaecd73f5d866e684c8cc4 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -604,8 +604,11 @@ by a child template that "extends" this file.
         <meta-data android:name="org.chromium.content.browser.NUM_PRIVILEGED_SERVICES"
             android:value="{{ num_privileged_services }}"/>
         {% for i in range(num_privileged_services) %}
+        {% set privileged_process_name = ':privileged_process%d' % i %}
+        <meta-data android:name="{{ manifest_package }}{{ privileged_process_name }}.ignore_multidex"

[Yaron, 2015/11/25 19:02:59]

nit: omit this for release builds (ok as follow-up)

[Ted C, 2015/11/25 19:14:11]

Added a TODO, this looks like it will require adding a new jinja variable as
build type is not exposed as of yet.  So a follow up will be better.

+android:value="true" />
         <service android:name="org.chromium.content.app.PrivilegedProcessService{{ i }}"
-            android:process=":privileged_process{{ i }}"
+            android:process="{{ privileged_process_name }}"
             android:permission="{{ manifest_package }}.permission.CHILD_SERVICE"
             android:isolatedProcess="false"
             android:exported="false" />