Add support for the ChromiumTestShellTest APK.

build/all_android.gyp

Index: build/all_android.gyp
diff --git a/build/all_android.gyp b/build/all_android.gyp
index c4ade0708230590a24962ab85b43855244b0441e..6a433ecbc822a32f03b9be4f35e93c762069d3fa 100644
--- a/build/all_android.gyp
+++ b/build/all_android.gyp
@@ -18,16 +18,10 @@
       'type': 'none',
       'dependencies': [
         '../android_webview/android_webview.gyp:android_webview_apk',
+        '../chrome/chrome.gyp:chromium_testshell',
         '../content/content.gyp:content_shell_apk',
         '<@(android_app_targets)',
         'android_builder_tests',
-      ],
-      'conditions': [
-        ['sdk_build==1', {
-          'dependencies': [
-            '../chrome/chrome.gyp:chromium_testshell',
-          ],
-        }],  # sdk_build==1
       ],  # conditions
     }, # target_name: All
     {
@@ -45,6 +39,7 @@
         '../android_webview/android_webview.gyp:android_webview_test_apk',
         '../base/android/jni_generator/jni_generator.gyp:jni_generator_tests',
         '../base/base.gyp:base_unittests',
+        '../chrome/chrome.gyp:chromium_testshell_test_apk',
         '../chrome/chrome.gyp:unit_tests',
         '../content/content.gyp:content_shell_test_apk',
         '../content/content.gyp:content_unittests',
@@ -94,7 +89,7 @@
             '../sync/sync.gyp:sync_unit_tests_apk',
             '../ui/ui.gyp:ui_unittests_apk',
           ],
-        }]
+        }],
       ],
     },
     {