Rename output jar created by apks to have chromium_apk_ prefix.

chrome/chrome_android.gypi

Index: chrome/chrome_android.gypi
diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi
index c5969d13b261ec6e51cc8ec1e5913a9ea00eb345..7b64b495487f9a8c56ff05d0e6fc5b34960b2fe8 100644
--- a/chrome/chrome_android.gypi
+++ b/chrome/chrome_android.gypi
@@ -95,14 +95,15 @@
         'chrome.gyp:chrome_java',
         'chromium_testshell',
       ],
-      'outputs': [
-        '<(PRODUCT_DIR)/lib.java/chromium_chromium_testshell.jar',
-      ],
+      'variables': {
+        'output_jar': '<(PRODUCT_DIR)/lib.java/chromium_apk_chromium_testshell.jar'
+      },
+      'outputs': ['<(output_jar)'],
       # This all_dependent_settings is used for java targets only. This will add
       # the chromium_testshell jar to the classpath of dependent java targets.
       'all_dependent_settings': {
         'variables': {
-          'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_chromium_testshell.jar'],
+          'input_jars_paths': ['<(output_jar)'],
         },
       },
       # Add an action with the appropriate output. This allows the generated
@@ -111,7 +112,7 @@
         {
           'action_name': 'fake_generate_jar',
           'inputs': [],
-          'outputs': ['<(PRODUCT_DIR)/lib.java/chromium_chromium_testshell.jar'],
+          'outputs': ['<(output_jar)'],
           'action': [],
         },
       ],