Rename APK tests workaround to make it more generic.

webrtc/webrtc_tests.gypi

Index: webrtc/webrtc_tests.gypi
diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi
index 4ade4728f4d10c7154fe5f3c03fcee9fb8e865b0..0c7dff2f5ea278934e2f7a46df8766fd06f39c84 100644
--- a/webrtc/webrtc_tests.gypi
+++ b/webrtc/webrtc_tests.gypi
@@ -329,28 +329,28 @@
           'target_name': 'rtc_unittests_apk_target',
           'type': 'none',
           'dependencies': [
-            '<(apk_tests_path):rtc_unittests_apk',
+            '<(android_tests_path):rtc_unittests_apk',
           ],
         },
         {
           'target_name': 'video_engine_tests_apk_target',
           'type': 'none',
           'dependencies': [
-            '<(apk_tests_path):video_engine_tests_apk',
+            '<(android_tests_path):video_engine_tests_apk',
           ],
         },
         {
           'target_name': 'webrtc_perf_tests_apk_target',
           'type': 'none',
           'dependencies': [
-            '<(apk_tests_path):webrtc_perf_tests_apk',
+            '<(android_tests_path):webrtc_perf_tests_apk',
           ],
         },
         {
           'target_name': 'webrtc_nonparallel_tests_apk_target',
           'type': 'none',
           'dependencies': [
-            '<(apk_tests_path):webrtc_nonparallel_tests_apk',
+            '<(android_tests_path):webrtc_nonparallel_tests_apk',
           ],
         },
       ],
@@ -362,7 +362,7 @@
                 'target_name': 'rtc_unittests_apk_run',
                 'type': 'none',
                 'dependencies': [
-                  '<(apk_tests_path):rtc_unittests_apk',
+                  '<(android_tests_path):rtc_unittests_apk',
                 ],
                 'includes': [
                   'build/isolate.gypi',
@@ -375,7 +375,7 @@
                 'target_name': 'video_engine_tests_apk_run',
                 'type': 'none',
                 'dependencies': [
-                  '<(apk_tests_path):video_engine_tests_apk',
+                  '<(android_tests_path):video_engine_tests_apk',
                 ],
                 'includes': [
                   'build/isolate.gypi',
@@ -388,7 +388,7 @@
                 'target_name': 'webrtc_perf_tests_apk_run',
                 'type': 'none',
                 'dependencies': [
-                  '<(apk_tests_path):webrtc_perf_tests_apk',
+                  '<(android_tests_path):webrtc_perf_tests_apk',
                 ],
                 'includes': [
                   'build/isolate.gypi',
@@ -401,7 +401,7 @@
                 'target_name': 'webrtc_nonparallel_tests_apk_run',
                 'type': 'none',
                 'dependencies': [
-                  '<(apk_tests_path):webrtc_nonparallel_tests_apk',
+                  '<(android_tests_path):webrtc_nonparallel_tests_apk',
                 ],
                 'includes': [
                   'build/isolate.gypi',