Fix the generate_apk logic when dev_build or debug_symbols are enabled

Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>

platform/android/SCsub

@@ -95,23 +95,16 @@ if lib_arch_dir != "":
         else:
             gradle_process = ["./gradlew"]
 
-        if env["target"] != "editor" and env["dev_build"]:
+        gradle_process += [
-            subprocess.run(
-                gradle_process
-                + [
-                    "generateDevTemplate",
-                    "--quiet",
-                ],
-                cwd="platform/android/java",
-            )
-        else:
-            # Android editor with `dev_build=yes` is handled by the `generateGodotEditor` task.
-            subprocess.run(
-                gradle_process
-                + [
             "generateGodotEditor" if env["target"] == "editor" else "generateGodotTemplates",
             "--quiet",
-                ],
+        ]
+
+        if env["debug_symbols"]:
+            gradle_process += ["-PdoNotStrip=true"]
+
+        subprocess.run(
+            gradle_process,
             cwd="platform/android/java",
         )