Rename APK tests workaround to make it more generic.

webrtc/build/common.gypi

 # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 # This file contains common settings for building WebRTC components.
 
@@ skipping 16 matching lines @@
         'conditions': [
           # Include the iLBC audio codec?
           ['build_with_chromium==1 or build_with_mozilla==1', {
             'include_ilbc%': 0,
           }, {
             'include_ilbc%': 1,
           }],
 
           ['build_with_chromium==1', {
             'webrtc_root%': '<(DEPTH)/third_party/webrtc',
-            'apk_tests_path%': '<(DEPTH)/third_party/webrtc/build/apk_tests_noop.gyp',
+            'android_tests_path%': '<(DEPTH)/third_party/webrtc/build/android_tests_noop.gyp',
             'modules_java_gyp_path%': '<(DEPTH)/third_party/webrtc/modules/modules_java_chromium.gyp',
           }, {
             'webrtc_root%': '<(DEPTH)/webrtc',
-            'apk_tests_path%': '<(DEPTH)/webrtc/build/apk_tests.gyp',
+            'android_tests_path%': '<(DEPTH)/webrtc/build/android_tests.gyp',
             'modules_java_gyp_path%': '<(DEPTH)/webrtc/modules/modules_java.gyp',
           }],
 
           # Controls whether we use libevent on posix platforms.
           # TODO(phoglund): should arguably be controlled by platform #ifdefs
           # in the code instead.
           ['OS=="win" or OS=="mac" or OS=="ios"', {
             'build_libevent%': 0,
             'enable_libevent%': 0,
           }, {
             'build_libevent%': 1,
             'enable_libevent%': 1,
           }],
         ],
       },
       'build_with_chromium%': '<(build_with_chromium)',
       'build_with_mozilla%': '<(build_with_mozilla)',
       'build_libevent%': '<(build_libevent)',
       'enable_libevent%': '<(enable_libevent)',
       'webrtc_root%': '<(webrtc_root)',
-      'apk_tests_path%': '<(apk_tests_path)',
+      'android_tests_path%': '<(android_tests_path)',
       'modules_java_gyp_path%': '<(modules_java_gyp_path)',
       'webrtc_vp8_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp8',
       'webrtc_vp9_dir%': '<(webrtc_root)/modules/video_coding/codecs/vp9',
       'include_ilbc%': '<(include_ilbc)',
       'include_opus%': '<(include_opus)',
       'opus_dir%': '<(DEPTH)/third_party/opus',
     },
     'build_with_chromium%': '<(build_with_chromium)',
     'build_with_mozilla%': '<(build_with_mozilla)',
     'build_libevent%': '<(build_libevent)',
     'enable_libevent%': '<(enable_libevent)',
     'webrtc_root%': '<(webrtc_root)',
-    'apk_tests_path%': '<(apk_tests_path)',
+    'android_tests_path%': '<(android_tests_path)',
     'test_runner_path': '<(DEPTH)/webrtc/build/android/test_runner.py',
     'modules_java_gyp_path%': '<(modules_java_gyp_path)',
     'webrtc_vp8_dir%': '<(webrtc_vp8_dir)',
     'webrtc_vp9_dir%': '<(webrtc_vp9_dir)',
     'include_ilbc%': '<(include_ilbc)',
     'include_opus%': '<(include_opus)',
     'rtc_relative_path%': 1,
     'external_libraries%': '0',
     'json_root%': '<(DEPTH)/third_party/jsoncpp/source/include/',
     # openssl needs to be defined or gyp will complain. Is is only used when
@@ skipping 503 matching lines @@
         }],
         ['OS=="freebsd"', {
           'defines': [
             'FREEBSD',
           ],
         }],
       ],
     },
   }, # target_defaults
 }