Put APK architecture after the version

In the name of the APKs, like it is for other outputs, rather than
putting it in front of the version.

src/desktop/CMakeLists.txt

@@ -602,7 +602,7 @@ elseif(ANDROID)
 	# This directory will get translations and other generated files added to it
 	# so it cannot be just a symlink to the source assets directory
 	file(MAKE_DIRECTORY "${build_time_assets_dir}")
-	set(output_apk "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<TARGET_PROPERTY:drawpile,OUTPUT_NAME>-${ANDROID_ABI}-${PROJECT_VERSION}.apk")
+	set(output_apk "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<TARGET_PROPERTY:drawpile,OUTPUT_NAME>-${PROJECT_VERSION}-${ANDROID_ABI}.apk")
 	include(GetSharedLibs)
 	get_shared_libs(android_extra_libs drawpile)