Android: cleanup gtest_target_type conditions.

build/apk_test.gypi

Index: build/apk_test.gypi
diff --git a/build/apk_test.gypi b/build/apk_test.gypi
index 0cb22b88e2e4143631efb288c7eca6a2efd23abb..95cce377d060837ff7f46988aeabd36ada715a8e 100644
--- a/build/apk_test.gypi
+++ b/build/apk_test.gypi
@@ -23,7 +23,7 @@
     '<(DEPTH)/tools/android/android_tools.gyp:android_tools',
   ],
   'conditions': [
-     ['OS == "android" and gtest_target_type == "shared_library"', {
+     ['OS == "android"', {
        'variables': {
          # These are used to configure java_apk.gypi included below.
          'apk_name': '<(test_suite_name)',
@@ -35,6 +35,6 @@
          'gyp_managed_install': 0,
        },
        'includes': [ 'java_apk.gypi' ],
-     }],  # 'OS == "android" and gtest_target_type == "shared_library"
+     }],  # 'OS == "android"
   ],  # conditions
 }