android: Fix build more after 255971.

build/android/ant/apk-package-resources.xml

Index: build/android/ant/apk-package-resources.xml
diff --git a/build/android/ant/apk-package-resources.xml b/build/android/ant/apk-package-resources.xml
index b716c16a5cba0ca31b992dd8c0a2999c1ca7c0b3..147ebc4cbf35f2eec1ee64be03d2828ce9fc3ed5 100644
--- a/build/android/ant/apk-package-resources.xml
+++ b/build/android/ant/apk-package-resources.xml
@@ -19,7 +19,6 @@
   <property name="out.dir" location="${OUT_DIR}" />
   <property name="out.absolute.dir" location="${out.dir}" />
   <property name="out.res.absolute.dir" location="${out.dir}/res" />
-  <property name="out.manifest.abs.file" location="${out.dir}/AndroidManifest.xml" />
 
   <!-- tools location -->
   <property name="sdk.dir" location="${ANDROID_SDK_ROOT}"/>
@@ -91,6 +90,9 @@
 
   <property name="build.packaging.nocrunch" value="true" />
 
+  <property name="manifest.file" value="${ANDROID_MANIFEST}" />
+  <property name="manifest.abs.file" location="${manifest.file}" />
+
   <!-- Intermediate files -->
   <property name="resource.package.file.name" value="${APK_NAME}.ap_" />
 
@@ -113,7 +115,7 @@
         versioncode="${version.code}"
         versionname="${version.name}"
         debug="${build.is.packaging.debug}"
-        manifest="${out.manifest.abs.file}"
+        manifest="${manifest.abs.file}"
         assets="${asset.absolute.dir}"
         androidjar="${project.target.android.jar}"
         apkfolder="${out.absolute.dir}"