Android: cleanup gtest_target_type conditions.

ui/ui_unittests.gyp

Index: ui/ui_unittests.gyp
diff --git a/ui/ui_unittests.gyp b/ui/ui_unittests.gyp
index f2ea0621af859a51037db31f9b0d675cb86bde3a..28e76aeeb6df0c240065dd2a5d56e1c7b5f7a3ac 100644
--- a/ui/ui_unittests.gyp
+++ b/ui/ui_unittests.gyp
@@ -135,7 +135,7 @@
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [ 4267, ],
         }],
-        ['OS == "android" and gtest_target_type == "shared_library"', {
+        ['OS == "android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
@@ -254,10 +254,7 @@
         },
       ],
     }],
-    # Special target to wrap a gtest_target_type==shared_library
-    # ui_unittests into an android apk for execution.
-    # See base.gyp for TODO(jrg)s about this strategy.
-    ['OS == "android" and gtest_target_type == "shared_library"', {
+    ['OS == "android"', {
       'targets': [
         {
           'target_name': 'ui_unittests_apk',