Android: cleanup gtest_target_type conditions.

remoting/remoting_android.gypi

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'conditions': [
     ['OS=="android"', {
       'targets': [
         {
           'target_name': 'remoting_jni_headers',
@@ skipping 116 matching lines @@
           'variables': {
             'apk_name': 'ChromotingTest',
             'java_in_dir': 'android/javatests',
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },  # end of target 'remoting_test_apk'
       ],  # end of 'targets'
     }],  # 'OS=="android"'
 
-    ['OS=="android" and gtest_target_type=="shared_library"', {
+    ['OS=="android"', {
       'targets': [
         {
           'target_name': 'remoting_unittests_apk',
           'type': 'none',
           'dependencies': [
             'remoting_unittests',
           ],
           'variables': {
             'test_suite_name': 'remoting_unittests',
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
-    }],  # 'OS=="android" and gtest_target_type=="shared_library"'
+    }],  # 'OS=="android"
   ],  # end of 'conditions'
 }