diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8b0a33841ad99..495761d0ae05d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -52,17 +52,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: mingw-check
-            os: ubuntu-20.04-4core-16gb
-            env: {}
-          - name: mingw-check-tidy
-            os: ubuntu-20.04-4core-16gb
-            env: {}
-          - name: x86_64-gnu-llvm-16
-            env:
-              ENABLE_GCC_CODEGEN: "1"
-            os: ubuntu-20.04-16core-64gb
-          - name: x86_64-gnu-tools
+          - name: arm-android
             os: ubuntu-20.04-16core-64gb
             env: {}
     defaults:
diff --git a/Cargo.lock b/Cargo.lock
index 47977a8850d6a..4dc61af4716be 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -447,9 +447,8 @@ version = "0.1.0"
 
 [[package]]
 name = "cc"
-version = "1.0.79"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+version = "1.0.89"
+source = "git+https://github.com/dpaoliello/cc-rs?branch=fixarm#ec3050366f1eb572cd227248a1cf87de64dae7bd"
 
 [[package]]
 name = "cfg-if"
diff --git a/Cargo.toml b/Cargo.toml
index 2ea16c2266615..bb51aa4da7f52 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -118,6 +118,7 @@ strip = true
 rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' }
 rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' }
 rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
+cc = { git="https://github.com/dpaoliello/cc-rs", branch="fixarm" }
 
 [patch."https://github.com/rust-lang/rust-clippy"]
 clippy_lints = { path = "src/tools/clippy/clippy_lints" }
diff --git a/compiler/rustc_llvm/Cargo.toml b/compiler/rustc_llvm/Cargo.toml
index 6598f1db86dac..f5fcda6be1341 100644
--- a/compiler/rustc_llvm/Cargo.toml
+++ b/compiler/rustc_llvm/Cargo.toml
@@ -15,5 +15,5 @@ libc = "0.2.73"
 # 1.0.{84, 85} fix this but have been yanked
 [build-dependencies]
 # tidy-alphabetical-start
-cc = "=1.0.79"
+cc = "1.0.80"
 # tidy-alphabetical-end
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 58d5dec9ba520..eaeca17b62d11 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -351,18 +351,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: mingw-check
-            <<: *job-linux-4c
-
-          - name: mingw-check-tidy
-            <<: *job-linux-4c
-
-          - name: x86_64-gnu-llvm-16
-            env:
-              ENABLE_GCC_CODEGEN: "1"
-            <<: *job-linux-16c
-
-          - name: x86_64-gnu-tools
+          - name: arm-android
             <<: *job-linux-16c
 
   auto: