Make android_apk template actually create an apk

build/android/ant/apk-package.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     Copyright (C) 2005-2008 The Android Open Source Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
 
          http://www.apache.org/licenses/LICENSE-2.0
 
@@ skipping 35 matching lines @@
   <property name="build.is.signing.debug" value="false"/>
 
   <!-- SDK tools assume that out.packaged.file is signed and name it "...-unaligned" -->
   <property name="out.packaged.file" value="${UNSIGNED_APK_PATH}" />
 
   <property name="native.libs.absolute.dir" location="${NATIVE_LIBS_DIR}" />
 
   <!-- Intermediate files -->
   <property name="resource.package.file.name" value="${RESOURCE_PACKAGED_APK_NAME}" />
 
-  <property name="dex.file.name" value="classes.dex" />
-  <property name="intermediate.dex.file" location="${out.absolute.dir}/${dex.file.name}" />
+  <property name="intermediate.dex.file" location="${DEX_FILE_PATH}" />
 
   <!-- Macro that enables passing a variable list of external jar files
        to ApkBuilder. -->
   <macrodef name="package-helper">
     <element name="extra-jars" optional="yes" />
     <sequential>
       <apkbuilder
           outfolder="${out.absolute.dir}"
           resourcefile="${resource.package.file.name}"
           apkfilepath="${out.packaged.file}"
@@ skipping 20 matching lines @@
             <jarfile path="${emma.device.jar}" />
           </extra-jars>
         </package-helper>
       </then>
       <else>
         <package-helper />
       </else>
     </if>
   </target>
 </project>