diff --git a/.github/workflows/llvm-project-tests.yml b/.github/workflows/llvm-project-tests.yml
index da32bd60529f..20cf69b2e156 100644
--- a/.github/workflows/llvm-project-tests.yml
+++ b/.github/workflows/llvm-project-tests.yml
@@ -62,6 +62,7 @@ jobs:
       image: ${{(startsWith(matrix.os, 'ubuntu') && 'ghcr.io/llvm/ci-ubuntu-22.04:latest') || null}}
       volumes:
         - /mnt/:/mnt/
+      options: --user root
     strategy:
       fail-fast: false
       matrix:
diff --git a/clang/lib/Driver/ToolChain.cpp b/clang/lib/Driver/ToolChain.cpp
index 425d9c0e1808..19469f4b992e 100644
--- a/clang/lib/Driver/ToolChain.cpp
+++ b/clang/lib/Driver/ToolChain.cpp
@@ -1830,7 +1830,10 @@ void ToolChain::AddTapirRuntimeLibArgs(const ArgList &Args,
     addOpenCilkRuntimeRunPath(*this, Args, CmdArgs, Triple);
     if (OnlyStaticOpenCilk) {
       CmdArgs.push_back("-Bdynamic");
-      CmdArgs.push_back("-lpthread");
+      if (!getTriple().isAndroid()) {
+        // There is no libpthread on Android
+        CmdArgs.push_back("-lpthread");
+      }
     }
     break;
   }