GN(android): Add scripts & runtime logic for installing _managed apks

build/config/android/internal_rules.gni

Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index 90f868e9fd6a563ca849849e5a1c023773ceed67..eb71d7601e88cde1eda4753e1a6d46aa2b233a2d 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -638,13 +638,17 @@ template("create_apk") {
   set_sources_assignment_filter([])
   forward_variables_from(invoker, [ "testonly" ])
 
+  _template_name = target_name
+  assert(_template_name == _template_name)  # Mark as used.
+
   _android_manifest = invoker.android_manifest
   _base_path = invoker.base_path
   _final_apk_path = invoker.apk_path
   _managed_final_apk_path_helper =
       process_file_template([ _final_apk_path ],
-                            "{{source_dir}}/{{source_name_part}}_managed.apk")
-  _managed_final_apk_path = _managed_final_apk_path_helper[0]
+                            "{{source_dir}}/{{source_name_part}}_managed")
+  _managed_final_apk_path_no_ext = _managed_final_apk_path_helper[0]
+  _managed_final_apk_path = "${_managed_final_apk_path_no_ext}.apk"
 
   if (defined(invoker.resources_zip)) {
     _resources_zip = invoker.resources_zip
@@ -1207,9 +1211,7 @@ template("java_library_impl") {
   }
 
   _java_files = []
-  if (defined(invoker.java_files)) {
-    _java_files = invoker.java_files
-  } else if (defined(invoker.DEPRECATED_java_in_dir)) {
+  if (defined(invoker.DEPRECATED_java_in_dir)) {
     _src_dir = invoker.DEPRECATED_java_in_dir + "/src"
     _src_dir_exists = exec_script("//build/dir_exists.py",
                                   [ rebase_path(_src_dir, root_build_dir) ],
@@ -1218,16 +1220,20 @@ template("java_library_impl") {
            "In GN, java_in_dir should be the fully specified java directory " +
                "(i.e. including the trailing \"/src\")")
 
-    _java_files_build_rel = exec_script(
-            "//build/android/gyp/find.py",
-            [
-              "--pattern",
-              "*.java",
-              rebase_path(invoker.DEPRECATED_java_in_dir, root_build_dir),
-            ],
-            "list lines")
+    _java_files_build_rel =
+        exec_script("//build/android/gyp/find.py",
+                    [
+                      "--pattern",
+                      "*.java",
+                      rebase_path(invoker.DEPRECATED_java_in_dir,
+                                  root_build_dir),
+                    ],
+                    "list lines")
     _java_files = rebase_path(_java_files_build_rel, ".", root_build_dir)
   }
+  if (defined(invoker.java_files)) {
+    _java_files += invoker.java_files
+  }
   assert(_java_files != [] || _srcjar_deps != [] || _srcjars != [])
 
   _compile_java_target = "${_template_name}__compile_java"