Android: cleanup gtest_target_type conditions.

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 2e5ee2cbcdb592a0cc33bda12853ada9bd6c8cc6..bb2847266bb87b51bfc3252c782af9deb8192150 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -796,7 +796,7 @@
             ],
           },
         ],
-        ['OS == "android" and gtest_target_type == "shared_library"', {
+        ['OS == "android"', {
           # TODO(mmenke):  This depends on test_support_base, which depends on
           #                icu.  Figure out a way to remove that dependency.
           'dependencies': [
@@ -1626,10 +1626,7 @@
         },
       ],
     }],
-    # Special target to wrap a gtest_target_type==shared_library
-    # net_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': 'net_unittests_apk',