diff --git a/mace/examples/cli/BUILD.bazel b/mace/examples/cli/BUILD.bazel
index 693009e37f0a5a49fc1ca4ffab771c67de25b7c5..70db67223b60ea701bfe9746561531afc89f27e9 100644
--- a/mace/examples/cli/BUILD.bazel
+++ b/mace/examples/cli/BUILD.bazel
@@ -18,6 +18,7 @@ cc_binary(
         "-DMACE_ENABLE_OPENCL",
     ]),
     linkopts = [
+        "-fuse-ld=gold",
         "-lm",
         "-ldl",
     ] + if_openmp_enabled([
@@ -53,6 +54,7 @@ cc_binary(
         "-DMACE_ENABLE_OPENCL",
     ]),
     linkopts = [
+        "-fuse-ld=gold",
         "-lm",
         "-ldl",
     ] + if_android([
diff --git a/mace/tools/validation/BUILD.bazel b/mace/tools/validation/BUILD.bazel
index d85283acbc9b1e407e3c7a0bf69ebf5182804897..6793b898c2e6dbe826ecc9acf893d4da3334aa9d 100644
--- a/mace/tools/validation/BUILD.bazel
+++ b/mace/tools/validation/BUILD.bazel
@@ -10,7 +10,11 @@ cc_binary(
     ] + if_opencl_enabled([
         "-DMACE_ENABLE_OPENCL",
     ]),
-    linkopts = if_openmp_enabled(["-fopenmp"]),
+    linkopts = [
+        "-fuse-ld=gold",
+    ] + if_openmp_enabled([
+        "-fopenmp",
+    ]),
     linkstatic = 1,
     deps = [
         "//external:gflags_nothreads",
@@ -29,7 +33,9 @@ cc_binary(
     ] + if_opencl_enabled([
         "-DMACE_ENABLE_OPENCL",
     ]),
-    linkopts = if_openmp_enabled([
+    linkopts = [
+        "-fuse-ld=gold",
+    ] + if_openmp_enabled([
         "-fopenmp",
     ]),
     linkstatic = 0,
diff --git a/third_party/hta/BUILD.bazel b/third_party/hta/BUILD.bazel
index 7385472755eab0a1fb75df4bb089a63aa01e110e..4f15e31c288b07efdbd97c6d7334e4363066d501 100644
--- a/third_party/hta/BUILD.bazel
+++ b/third_party/hta/BUILD.bazel
@@ -17,7 +17,6 @@ cc_library(
         "armeabi-v7a/libhta_hexagon_runtime.so",
         "armeabi-v7a/libnpu.so",
     ]) + if_android_arm64([
-        "arm64-v8a/libcdsprpc.so",
         "arm64-v8a/libhta_controller.so",
         "arm64-v8a/libhta_hexagon_runtime.so",
         "arm64-v8a/libnpu.so",
diff --git a/third_party/hta/arm64-v8a/libcdsprpc.so b/third_party/hta/arm64-v8a/libcdsprpc.so
deleted file mode 100755
index 57de01f4887197b0b510f395f828289d74597069..0000000000000000000000000000000000000000
Binary files a/third_party/hta/arm64-v8a/libcdsprpc.so and /dev/null differ
diff --git a/third_party/nnlib/BUILD.bazel b/third_party/nnlib/BUILD.bazel
index 7fc7b13b38a595ee56e20b48e81a532541354ba2..3aa2aae62995b68315664614e86ac9f0256ef14d 100644
--- a/third_party/nnlib/BUILD.bazel
+++ b/third_party/nnlib/BUILD.bazel
@@ -15,7 +15,6 @@ cc_library(
     srcs = if_android_armv7([
         "armeabi-v7a/libhexagon_controller.so",
     ]) + if_android_arm64([
-        "arm64-v8a/libcdsprpc.so",
         "arm64-v8a/libhexagon_controller.so",
     ]),
     hdrs = [
diff --git a/third_party/nnlib/arm64-v8a/libcdsprpc.so b/third_party/nnlib/arm64-v8a/libcdsprpc.so
deleted file mode 100755
index 57de01f4887197b0b510f395f828289d74597069..0000000000000000000000000000000000000000
Binary files a/third_party/nnlib/arm64-v8a/libcdsprpc.so and /dev/null differ