Revert of [Android] Add gyp support for multidex.

build/android/ant/apk-package.xml

Index: build/android/ant/apk-package.xml
diff --git a/build/android/ant/apk-package.xml b/build/android/ant/apk-package.xml
index cb7956091810c8c4da8e120376e6eeb0855bfb58..e8b76f7e453064d56ef3ac2f4c3a3d44be1d7e57 100644
--- a/build/android/ant/apk-package.xml
+++ b/build/android/ant/apk-package.xml
@@ -54,9 +54,6 @@
   <property name="resource.package.file.name" value="${RESOURCE_PACKAGED_APK_NAME}" />
 
   <property name="intermediate.dex.file" location="${DEX_FILE_PATH}" />
-  <condition property="multidex.enabled" value="true">
-    <equals arg1="${MULTIDEX_ENABLED}" arg2="1"/>
-  </condition>
 
   <!-- Macro that enables passing a variable list of external jar files
        to ApkBuilder. -->
@@ -73,32 +70,13 @@
           hascode="${HAS_CODE}"
           previousBuildType="/"
           buildType="${build.is.packaging.debug}/${build.is.signing.debug}">
-        <dex path="${intermediate.dex.file}" />
+        <dex path="${intermediate.dex.file}"/>
         <nativefolder path="${native.libs.absolute.dir}" />
         <extra-jars/>
       </apkbuilder>
     </sequential>
   </macrodef>
 
-  <macrodef name="multidex-package-helper">
-    <element name="extra-jars" optional="yes" />
-    <sequential>
-      <apkbuilder
-          outfolder="${out.absolute.dir}"
-          resourcefile="${resource.package.file.name}"
-          apkfilepath="${out.packaged.file}"
-          debugpackaging="${build.is.packaging.debug}"
-          debugsigning="${build.is.signing.debug}"
-          verbose="${verbose}"
-          hascode="false"
-          previousBuildType="/"
-          buildType="${build.is.packaging.debug}/${build.is.signing.debug}">
-        <zip path="${intermediate.dex.file}" />
-        <nativefolder path="${native.libs.absolute.dir}" />
-        <extra-jars/>
-      </apkbuilder>
-    </sequential>
-  </macrodef>
 
   <!-- Packages the application. -->
   <target name="-package">
@@ -111,14 +89,7 @@
         </package-helper>
       </then>
       <else>
-        <if condition="${multidex.enabled}">
-          <then>
-            <multidex-package-helper />
-          </then>
-          <else>
-            <package-helper />
-          </else>
-        </if>
+        <package-helper />
       </else>
     </if>
   </target>