diff --git a/webrtc/common_audio/common_audio_unittests.isolate b/webrtc/common_audio/common_audio_unittests.isolate
index 7eedcd7aca..e6b1db6e45 100644
--- a/webrtc/common_audio/common_audio_unittests.isolate
+++ b/webrtc/common_audio/common_audio_unittests.isolate
@@ -7,6 +7,16 @@
 # be found in the AUTHORS file in the root of the source tree.
 {
   'conditions': [
+    ['OS=="android"', {
+      # When doing Android builds, the WebRTC code is put in third_party/webrtc
+      # of a Chromium checkout, this is one level above the standalone build.
+      'variables': {
+        'isolate_dependency_untracked': [
+          '../../../data/',
+          '../../../resources/',
+        ],
+      },
+    }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'command': [
diff --git a/webrtc/common_video/common_video_unittests.isolate b/webrtc/common_video/common_video_unittests.isolate
index f173ff7a23..e96645a87c 100644
--- a/webrtc/common_video/common_video_unittests.isolate
+++ b/webrtc/common_video/common_video_unittests.isolate
@@ -7,6 +7,16 @@
 # be found in the AUTHORS file in the root of the source tree.
 {
   'conditions': [
+    ['OS=="android"', {
+      # When doing Android builds, the WebRTC code is put in third_party/webrtc
+      # of a Chromium checkout, this is one level above the standalone build.
+      'variables': {
+        'isolate_dependency_untracked': [
+          '../../../data/',
+          '../../../resources/',
+        ],
+      },
+    }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'command': [
diff --git a/webrtc/modules/audio_coding/neteq/neteq_unittests.isolate b/webrtc/modules/audio_coding/neteq/neteq_unittests.isolate
index a2c061367a..78d805ccfe 100644
--- a/webrtc/modules/audio_coding/neteq/neteq_unittests.isolate
+++ b/webrtc/modules/audio_coding/neteq/neteq_unittests.isolate
@@ -7,6 +7,16 @@
 # be found in the AUTHORS file in the root of the source tree.
 {
   'conditions': [
+    ['OS=="android"', {
+      # When doing Android builds, the WebRTC code is put in third_party/webrtc
+      # of a Chromium checkout, this is one level above the standalone build.
+      'variables': {
+        'isolate_dependency_untracked': [
+          '../../../../../data/',
+          '../../../../../resources/',
+        ],
+      },
+    }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'command': [
diff --git a/webrtc/modules/audio_coding/neteq4/audio_decoder_unittests.isolate b/webrtc/modules/audio_coding/neteq4/audio_decoder_unittests.isolate
index 33c4a4b941..63177801a7 100644
--- a/webrtc/modules/audio_coding/neteq4/audio_decoder_unittests.isolate
+++ b/webrtc/modules/audio_coding/neteq4/audio_decoder_unittests.isolate
@@ -7,6 +7,16 @@
 # be found in the AUTHORS file in the root of the source tree.
 {
   'conditions': [
+    ['OS=="android"', {
+      # When doing Android builds, the WebRTC code is put in third_party/webrtc
+      # of a Chromium checkout, this is one level above the standalone build.
+      'variables': {
+        'isolate_dependency_untracked': [
+          '../../../../../resources/',
+          '../../../../../data/',
+        ],
+      },
+    }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'command': [
diff --git a/webrtc/modules/audio_device/audio_device_test_api.isolate b/webrtc/modules/audio_device/audio_device_test_api.isolate
deleted file mode 100644
index ec04929f73..0000000000
--- a/webrtc/modules/audio_device/audio_device_test_api.isolate
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2013 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.
-{
-  'conditions': [
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
-      'variables': {
-        'command': [
-          '../../../testing/test_env.py',
-          '../../../tools/swarm_client/googletest/run_test_cases.py',
-          '<(PRODUCT_DIR)/audio_device_test_api<(EXECUTABLE_SUFFIX)',
-        ],
-        'isolate_dependency_tracked': [
-          '../../../testing/test_env.py',
-          '../../../tools/swarm_client/run_isolated.py',
-          '../../../tools/swarm_client/googletest/run_test_cases.py',
-          '../../../tools/swarm_client/third_party/upload.py',
-          '<(PRODUCT_DIR)/audio_device_test_api<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
-  ],
-}
diff --git a/webrtc/modules/audio_device/audio_device_tests.isolate b/webrtc/modules/audio_device/audio_device_tests.isolate
index 65b1b06cfe..38b397f520 100644
--- a/webrtc/modules/audio_device/audio_device_tests.isolate
+++ b/webrtc/modules/audio_device/audio_device_tests.isolate
@@ -7,6 +7,16 @@
 # be found in the AUTHORS file in the root of the source tree.
 {
   'conditions': [
+    ['OS=="android"', {
+      # When doing Android builds, the WebRTC code is put in third_party/webrtc
+      # of a Chromium checkout, this is one level above the standalone build.
+      'variables': {
+        'isolate_dependency_untracked': [
+          '../../../../data/',
+          '../../../../resources/',
+        ],
+      },
+    }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'command': [
diff --git a/webrtc/modules/modules_tests.isolate b/webrtc/modules/modules_tests.isolate
index 36eb446ed9..a473720e29 100644
--- a/webrtc/modules/modules_tests.isolate
+++ b/webrtc/modules/modules_tests.isolate
@@ -7,6 +7,16 @@
 # be found in the AUTHORS file in the root of the source tree.
 {
   'conditions': [
+    ['OS=="android"', {
+      # When doing Android builds, the WebRTC code is put in third_party/webrtc
+      # of a Chromium checkout, this is one level above the standalone build.
+      'variables': {
+        'isolate_dependency_untracked': [
+          '../../../data/',
+          '../../../resources/',
+        ],
+      },
+    }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'command': [
@@ -20,7 +30,7 @@
           '../../resources/audio_coding/teststereo32kHz.pcm',
           '../../resources/foreman_cif.yuv',
           '../../resources/paris_qcif.yuv',
-           '../../testing/test_env.py',
+          '../../testing/test_env.py',
           '../../tools/swarm_client/run_isolated.py',
           '../../tools/swarm_client/googletest/run_test_cases.py',
           '../../tools/swarm_client/third_party/upload.py',
diff --git a/webrtc/modules/modules_unittests.isolate b/webrtc/modules/modules_unittests.isolate
index 353c24ef3d..43e659ce09 100644
--- a/webrtc/modules/modules_unittests.isolate
+++ b/webrtc/modules/modules_unittests.isolate
@@ -8,10 +8,12 @@
 {
   'conditions': [
     ['OS=="android"', {
+      # When doing Android builds, the WebRTC code is put in third_party/webrtc
+      # of a Chromium checkout, this is one level above the standalone build.
       'variables': {
         'isolate_dependency_untracked': [
-          '../../../resources/',
           '../../../data/',
+          '../../../resources/',
         ],
       },
     }],
diff --git a/webrtc/modules/video_capture/video_capture_module_test.isolate b/webrtc/modules/video_capture/video_capture_module_test.isolate
deleted file mode 100644
index 1c3a4b577e..0000000000
--- a/webrtc/modules/video_capture/video_capture_module_test.isolate
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2013 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.
-{
-  'conditions': [
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
-      'variables': {
-        'command': [
-          '../../../testing/test_env.py',
-          '../../../tools/swarm_client/googletest/run_test_cases.py',
-          '<(PRODUCT_DIR)/vp8_unittests<(EXECUTABLE_SUFFIX)',
-        ],
-        'isolate_dependency_tracked': [
-          '../../../testing/test_env.py',
-          '../../../tools/swarm_client/run_isolated.py',
-          '../../../tools/swarm_client/googletest/run_test_cases.py',
-          '../../../tools/swarm_client/third_party/upload.py',
-          '<(PRODUCT_DIR)/vp8_unittests<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
-  ],
-}
diff --git a/webrtc/modules/video_capture/video_capture_tests.isolate b/webrtc/modules/video_capture/video_capture_tests.isolate
index fd4ed0ef9f..bafbd8b4c5 100644
--- a/webrtc/modules/video_capture/video_capture_tests.isolate
+++ b/webrtc/modules/video_capture/video_capture_tests.isolate
@@ -7,6 +7,16 @@
 # be found in the AUTHORS file in the root of the source tree.
 {
   'conditions': [
+    ['OS=="android"', {
+      # When doing Android builds, the WebRTC code is put in third_party/webrtc
+      # of a Chromium checkout, this is one level above the standalone build.
+      'variables': {
+        'isolate_dependency_untracked': [
+          '../../../../data/',
+          '../../../../resources/',
+        ],
+      },
+    }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'command': [
diff --git a/webrtc/modules/video_render/video_render_module_test.isolate b/webrtc/modules/video_render/video_render_module_test.isolate
deleted file mode 100644
index 6157b6d683..0000000000
--- a/webrtc/modules/video_render/video_render_module_test.isolate
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2013 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.
-{
-  'conditions': [
-    ['OS=="linux" or OS=="mac" or OS=="win"', {
-      'variables': {
-        'command': [
-          '../../../testing/test_env.py',
-          '../../../tools/swarm_client/googletest/run_test_cases.py',
-          '<(PRODUCT_DIR)/video_render_module_test<(EXECUTABLE_SUFFIX)',
-        ],
-        'isolate_dependency_tracked': [
-          '../../../testing/test_env.py',
-          '../../../tools/swarm_client/run_isolated.py',
-          '../../../tools/swarm_client/googletest/run_test_cases.py',
-          '../../../tools/swarm_client/third_party/upload.py',
-          '<(PRODUCT_DIR)/video_render_module_test<(EXECUTABLE_SUFFIX)',
-        ],
-      },
-    }],
-  ],
-}
diff --git a/webrtc/modules/video_render/video_render_tests.isolate b/webrtc/modules/video_render/video_render_tests.isolate
index ffc875d4c2..bd596be56c 100644
--- a/webrtc/modules/video_render/video_render_tests.isolate
+++ b/webrtc/modules/video_render/video_render_tests.isolate
@@ -7,6 +7,16 @@
 # be found in the AUTHORS file in the root of the source tree.
 {
   'conditions': [
+    ['OS=="android"', {
+      # When doing Android builds, the WebRTC code is put in third_party/webrtc
+      # of a Chromium checkout, this is one level above the standalone build.
+      'variables': {
+        'isolate_dependency_untracked': [
+          '../../../../data/',
+          '../../../../resources/',
+        ],
+      },
+    }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'command': [
diff --git a/webrtc/system_wrappers/source/system_wrappers_unittests.isolate b/webrtc/system_wrappers/source/system_wrappers_unittests.isolate
index 84672c771f..c13ad88656 100644
--- a/webrtc/system_wrappers/source/system_wrappers_unittests.isolate
+++ b/webrtc/system_wrappers/source/system_wrappers_unittests.isolate
@@ -8,6 +8,16 @@
 
 {
   'conditions': [
+    ['OS=="android"', {
+      # When doing Android builds, the WebRTC code is put in third_party/webrtc
+      # of a Chromium checkout, this is one level above the standalone build.
+      'variables': {
+        'isolate_dependency_untracked': [
+          '../../../../resources/',
+          '../../../../data/',
+        ],
+      },
+    }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'command': [
diff --git a/webrtc/test/metrics_unittests.isolate b/webrtc/test/metrics_unittests.isolate
index 5254df0167..52287e34da 100644
--- a/webrtc/test/metrics_unittests.isolate
+++ b/webrtc/test/metrics_unittests.isolate
@@ -7,6 +7,16 @@
 # be found in the AUTHORS file in the root of the source tree.
 {
   'conditions': [
+    ['OS=="android"', {
+      # When doing Android builds, the WebRTC code is put in third_party/webrtc
+      # of a Chromium checkout, this is one level above the standalone build.
+      'variables': {
+        'isolate_dependency_untracked': [
+          '../../../data/',
+          '../../../resources/',
+        ],
+      },
+    }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'command': [
diff --git a/webrtc/test/test_support_unittests.isolate b/webrtc/test/test_support_unittests.isolate
index d60dce40d3..3384ab8c7a 100644
--- a/webrtc/test/test_support_unittests.isolate
+++ b/webrtc/test/test_support_unittests.isolate
@@ -7,6 +7,16 @@
 # be found in the AUTHORS file in the root of the source tree.
 {
   'conditions': [
+    ['OS=="android"', {
+      # When doing Android builds, the WebRTC code is put in third_party/webrtc
+      # of a Chromium checkout, this is one level above the standalone build.
+      'variables': {
+        'isolate_dependency_untracked': [
+          '../../../data/',
+          '../../../resources/',
+        ],
+      },
+    }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'command': [
diff --git a/webrtc/test/testsupport/metrics/video_metrics_unittest.cc b/webrtc/test/testsupport/metrics/video_metrics_unittest.cc
index 2803322092..21f86aad36 100644
--- a/webrtc/test/testsupport/metrics/video_metrics_unittest.cc
+++ b/webrtc/test/testsupport/metrics/video_metrics_unittest.cc
@@ -140,4 +140,11 @@ TEST_F(VideoMetricsTest, DISABLED_ON_ANDROID(EmptyFilesBothMetrics)) {
                                    &psnr_result_, &ssim_result_));
 }
 
+// Dummy test to get at least one test in this executable for Android
+// (otherwise gtest will fail execution on Android).
+// TODO(kjellander): Remove when the other tests have been fixed for
+// Android.
+TEST_F(VideoMetricsTest, DummyTest) {
+}
+
 }  // namespace webrtc
diff --git a/webrtc/tools/tools_unittests.isolate b/webrtc/tools/tools_unittests.isolate
index 60c2231f61..14bd899559 100644
--- a/webrtc/tools/tools_unittests.isolate
+++ b/webrtc/tools/tools_unittests.isolate
@@ -7,6 +7,16 @@
 # be found in the AUTHORS file in the root of the source tree.
 {
   'conditions': [
+    ['OS=="android"', {
+      # When doing Android builds, the WebRTC code is put in third_party/webrtc
+      # of a Chromium checkout, this is one level above the standalone build.
+      'variables': {
+        'isolate_dependency_untracked': [
+          '../../../data/',
+          '../../../resources/',
+        ],
+      },
+    }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'command': [
diff --git a/webrtc/video_engine/test/auto_test/vie_auto_test.isolate b/webrtc/video_engine/test/auto_test/vie_auto_test.isolate
index fb3b9308d5..44418bffde 100644
--- a/webrtc/video_engine/test/auto_test/vie_auto_test.isolate
+++ b/webrtc/video_engine/test/auto_test/vie_auto_test.isolate
@@ -7,6 +7,16 @@
 # be found in the AUTHORS file in the root of the source tree.
 {
   'conditions': [
+    ['OS=="android"', {
+      # When doing Android builds, the WebRTC code is put in third_party/webrtc
+      # of a Chromium checkout, this is one level above the standalone build.
+      'variables': {
+        'isolate_dependency_untracked': [
+          '../../../../../data/',
+          '../../../../../resources/',
+        ],
+      },
+    }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'command': [
diff --git a/webrtc/video_engine/video_engine_core_unittests.isolate b/webrtc/video_engine/video_engine_core_unittests.isolate
index 28f5151e7e..a82611b91f 100644
--- a/webrtc/video_engine/video_engine_core_unittests.isolate
+++ b/webrtc/video_engine/video_engine_core_unittests.isolate
@@ -7,6 +7,16 @@
 # be found in the AUTHORS file in the root of the source tree.
 {
   'conditions': [
+    ['OS=="android"', {
+      # When doing Android builds, the WebRTC code is put in third_party/webrtc
+      # of a Chromium checkout, this is one level above the standalone build.
+      'variables': {
+        'isolate_dependency_untracked': [
+          '../../../data/',
+          '../../../resources/',
+        ],
+      },
+    }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'command': [
diff --git a/webrtc/voice_engine/voe_auto_test.isolate b/webrtc/voice_engine/voe_auto_test.isolate
index 465ec1a0f4..3401e3ffd0 100644
--- a/webrtc/voice_engine/voe_auto_test.isolate
+++ b/webrtc/voice_engine/voe_auto_test.isolate
@@ -7,6 +7,16 @@
 # be found in the AUTHORS file in the root of the source tree.
 {
   'conditions': [
+    ['OS=="android"', {
+      # When doing Android builds, the WebRTC code is put in third_party/webrtc
+      # of a Chromium checkout, this is one level above the standalone build.
+      'variables': {
+        'isolate_dependency_untracked': [
+          '../../../data/',
+          '../../../resources/',
+        ],
+      },
+    }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'command': [
diff --git a/webrtc/voice_engine/voice_engine_unittests.isolate b/webrtc/voice_engine/voice_engine_unittests.isolate
index d90fa3c7ae..4c17afa6ff 100644
--- a/webrtc/voice_engine/voice_engine_unittests.isolate
+++ b/webrtc/voice_engine/voice_engine_unittests.isolate
@@ -7,6 +7,16 @@
 # be found in the AUTHORS file in the root of the source tree.
 {
   'conditions': [
+    ['OS=="android"', {
+      # When doing Android builds, the WebRTC code is put in third_party/webrtc
+      # of a Chromium checkout, this is one level above the standalone build.
+      'variables': {
+        'isolate_dependency_untracked': [
+          '../../../data/',
+          '../../../resources/',
+        ],
+      },
+    }],
     ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'command': [