Android: cleanup gtest_target_type conditions.

sql/sql.gyp

Index: sql/sql.gyp
diff --git a/sql/sql.gyp b/sql/sql.gyp
index 6245940df266ddd815880e71875e6736fdc9c8de..37c6ae71091745123de58c935c5d07b8cae5e2e3 100644
--- a/sql/sql.gyp
+++ b/sql/sql.gyp
@@ -106,7 +106,7 @@
             }],
           ],
         }],
-        ['OS == "android" and gtest_target_type == "shared_library"', {
+        ['OS == "android"', {
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
           ],
@@ -117,9 +117,7 @@
     },
   ],
   'conditions': [
-    # Special target to wrap a gtest_target_type==shared_library
-    # sql_unittests into an android apk for execution.
-    ['OS == "android" and gtest_target_type == "shared_library"', {
+    ['OS == "android"', {
       'targets': [
         {
           'target_name': 'sql_unittests_apk',