diff --git a/.gn b/.gn
index 63dad32d5..5f2d3b69f 100644
--- a/.gn
+++ b/.gn
@@ -40,6 +40,7 @@ exec_script_whitelist = [
   "//build/config/win/visual_studio_version.gni",
   "//build/gn_helpers.py",
   "//build/gypi_to_gn.py",
+  "//build/toolchain/concurrent_links.gni",
   "//build/toolchain/gcc_toolchain.gni",
   "//build/toolchain/mac/BUILD.gn",
   "//build/toolchain/win/BUILD.gn",
diff --git a/libyuv.gyp b/libyuv.gyp
index db4b54904..3c84c8711 100644
--- a/libyuv.gyp
+++ b/libyuv.gyp
@@ -29,10 +29,13 @@
     'conditions': [
        ['(target_arch == "armv7" or target_arch == "armv7s" or \
        (target_arch == "arm" and arm_version >= 7) or target_arch == "arm64")\
-       and (arm_neon == 1 or arm_neon_optional == 1)',
-       {
+       and (arm_neon == 1 or arm_neon_optional == 1)', {
          'build_neon': 1,
        }],
+       ['OS=="android" and target_arch=="mipsel"', {
+         # Linking fails with the gold linker: bugs.webrtc.org/5977.
+         'linux_use_bundled_gold%': 0,
+       }],
     ],
   },