bin/calabash-android-build.rb in calabash-android-0.5.15 vs bin/calabash-android-build.rb in calabash-android-0.5.16.pre1

@@ -50,9 +50,20 @@
         raise "Could not create dummy.apk"
       end
 
       Zip::File.new("dummy.apk").extract("AndroidManifest.xml","customAndroidManifest.xml")
       Zip::File.open("TestServer.apk") do |zip_file|
+        begin
+          check_file("AndroidManifest.xml")
+          manifest_exists = true
+        rescue
+          manifest_exists = false
+        end
+
+        if manifest_exists
+          zip_file.remove("AndroidManifest.xml")
+        end
+
         zip_file.add("AndroidManifest.xml", "customAndroidManifest.xml")
       end
     end
     keystore.sign_apk("#{workspace_dir}/TestServer.apk", test_server_file_name)
     begin