diff --git a/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU= b/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU=
index 99b2490ac37..d330048e844 100755
--- a/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU=
+++ b/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU=
@@ -1,7 +1,5 @@
 # @generated
 # Input hashes for repository rule npm_translate_lock(name = "npm", pnpm_lock = "//:pnpm-lock.yaml").
 # This file should be checked into version control along with the pnpm-lock.yaml file.
-.npmrc=-592547263
-pnpm-lock.yaml=104874376
-package-lock.json=-1109603374
-package.json=752745807
+pnpm-lock.yaml=322447152
+package.json=1512585561
diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index 2e6e9abd36b..79f50116dd1 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -70,6 +70,9 @@ jobs:
           distribution: "temurin"
           java-version: "17"
 
+      - name: Add aarch64-linux-android for Rust toolchian
+        run: rustup target add --toolchain stable-x86_64-unknown-linux-gnu aarch64-linux-android
+
       - name: Cache node modules
         uses: actions/cache@v4
         env:
@@ -174,6 +177,9 @@ jobs:
         distribution: "temurin"
         java-version: "17"
 
+    - name: Add aarch64-linux-android for Rust toolchian
+      run: rustup target add --toolchain stable-x86_64-unknown-linux-gnu aarch64-linux-android
+
     - name: Get CMake and Ninja
       uses: lukka/get-cmake@latest
       with:
@@ -223,6 +229,9 @@ jobs:
           distribution: "temurin"
           java-version: "17"
 
+      - name: Add aarch64-linux-android for Rust toolchian
+        run: rustup target add --toolchain stable-x86_64-unknown-linux-gnu aarch64-linux-android
+
       - name: Build Render Test App
         run: |
           ./gradlew assemble assembleAndroidTest
diff --git a/.gitmodules b/.gitmodules
index c878230b910..b7d91b51205 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -58,3 +58,6 @@
 [submodule "vendor/glslang"]
 	path = vendor/glslang
 	url = https://github.com/KhronosGroup/glslang.git
+[submodule "vendor/corrosion"]
+	path = vendor/corrosion
+	url = https://github.com/corrosion-rs/corrosion.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 900e722f296..68572c97b8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1439,13 +1439,7 @@ set_target_properties(
         INTERFACE_MAPBOX_LICENSE ${PROJECT_SOURCE_DIR}/vendor/unordered_dense/LICENSE
 )
 
-include(FetchContent)
-FetchContent_Declare(
-        Corrosion
-        GIT_REPOSITORY https://github.com/corrosion-rs/corrosion.git
-        GIT_TAG v0.5
-)
-FetchContent_MakeAvailable(Corrosion)
+add_subdirectory(${PROJECT_SOURCE_DIR}/vendor/corrosion)
 
 corrosion_import_crate(MANIFEST_PATH rustutils/Cargo.toml)
 # rustutils_headers is a set of .h headers generated from rustutils crate
diff --git a/vendor/corrosion b/vendor/corrosion
new file mode 160000
index 00000000000..64289b1d79d
--- /dev/null
+++ b/vendor/corrosion
@@ -0,0 +1 @@
+Subproject commit 64289b1d79d6d19cd2e241db515381a086bb8407