Rename output jar created by apks to have chromium_apk_ prefix.

content/content_shell.gypi

Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 48f252b05223728b3b75a8507d2e54dad3f37635..3084d73fa4803a16fe402960e4db769e6d544504 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -601,9 +601,10 @@
           # content_shell_java.
           'target_name': 'content_shell_java',
           'type': 'none',
-          'outputs': [
-            '<(PRODUCT_DIR)/lib.java/chromium_content_shell.jar',
-          ],
+          'variables': {
+            'output_jar': '<(PRODUCT_DIR)/lib.java/chromium_apk_content_shell.jar'
+          },
+          'outputs': ['<(output_jar)'],
           'dependencies': [
             'content_java',
             'content_shell_apk',
@@ -617,7 +618,7 @@
           # targets.
           'all_dependent_settings': {
             'variables': {
-              'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_content_shell.jar'],
+              'input_jars_paths': ['<(output_jar)'],
             },
           },
           # Add an action with the appropriate output. This allows the generated
@@ -626,7 +627,7 @@
             {
               'action_name': 'fake_generate_jar',
               'inputs': [],
-              'outputs': ['<(PRODUCT_DIR)/lib.java/chromium_content_shell.jar'],
+              'outputs': ['<(output_jar)'],
               'action': [],
             },
           ],