diff --git a/.github/workflows/commit.yml b/.github/workflows/commit.yml
index 659072861..d9a1b4bbc 100644
--- a/.github/workflows/commit.yml
+++ b/.github/workflows/commit.yml
@@ -99,6 +99,6 @@ jobs:
         echo "      are still good, copy it into the repo and commit it."
         echo "> diff tests/regression/results.csv $CIRCLE_ARTIFACTS/results.csv"
         diff tests/regression/results.csv $CIRCLE_ARTIFACTS/results.csv
-    - uses: actions/upload-artifact@v4
+    - uses: actions/upload-artifact@v7
       with:
         path: "/tmp/circleci-artifacts"
diff --git a/.github/workflows/dev-long-tests.yml b/.github/workflows/dev-long-tests.yml
index 899a57b75..d6322c89e 100644
--- a/.github/workflows/dev-long-tests.yml
+++ b/.github/workflows/dev-long-tests.yml
@@ -306,7 +306,7 @@ jobs:
         dry-run: false
         sanitizer: ${{ matrix.sanitizer }}
     - name: Upload Crash
-      uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # tag=v4.3.1
+      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # tag=v7.0.1
       if: failure() && steps.build.outcome == 'success'
       with:
         name: ${{ matrix.sanitizer }}-artifacts
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
index e532b03bf..68d09569a 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -51,7 +51,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # tag=v4.3.1
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # tag=v7.0.1
         with:
           name: SARIF file
           path: results.sarif
diff --git a/.github/workflows/windows-artifacts.yml b/.github/workflows/windows-artifacts.yml
index 35999476e..63ce84edf 100644
--- a/.github/workflows/windows-artifacts.yml
+++ b/.github/workflows/windows-artifacts.yml
@@ -52,7 +52,7 @@ jobs:
         cd ..
 
     - name: Publish zstd-$VERSION-${{matrix.ziparch}}.zip
-      uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # tag=v4.3.1
+      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # tag=v7.0.1
       with:
         path: ${{ github.workspace }}/zstd-${{ github.ref_name }}-${{matrix.ziparch}}.zip
         name: zstd-${{ github.ref_name }}-${{matrix.ziparch}}.zip
diff --git a/Android.bp b/Android.bp
index 85d972884..51f5d112f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -77,6 +77,7 @@ cc_library {
         "//external/elfutils:__subpackages__",
         "//external/libbpf:__subpackages__",
         "//external/mesa3d:__subpackages__",
+        "//external/rsync:__subpackages__",
         "//external/squashfs-tools/squashfs-tools:__subpackages__",
         "//external/stg:__subpackages__",
         "//frameworks/libs/binary_translation/tools:__subpackages__",
@@ -109,15 +110,56 @@ cc_library {
     export_include_dirs: ["lib"],
 }
 
-cc_binary_host {
+cc_binary {
     name: "zstd",
     defaults: ["zstd_defaults"],
-    srcs: [
-        "programs/*.c",
-        // Rebuild the whole library as part of the binary to enable multithreading.
-        "lib/*/*.c",
-    ],
-    cflags: ["-DZSTD_MULTITHREAD=1"],
+    system_ext_specific: true,
+    host_supported: true,
+    target: {
+        android: {
+            srcs: ["programs/*.c"],
+            cflags: [
+                "-DZSTD_GZCOMPRESS",
+                "-DZSTD_GZDECOMPRESS",
+                "-DZSTD_LZ4COMPRESS",
+                "-DZSTD_LZ4DECOMPRESS",
+                "-DZSTD_MULTITHREAD",
+                "-Wall",
+                "-Werror",
+            ],
+            shared_libs: [
+                "liblz4",
+                "libz",
+                "libzstd",
+            ],
+            required: ["zstdgrep", "zstdless"],
+            symlinks: [
+                "zstdcat",
+                "zstdmt",
+                "unzstd",
+            ],
+        },
+        host: {
+            srcs: [
+                "programs/*.c",
+                // Rebuild the whole library as part of the binary to enable multithreading.
+                "lib/*/*.c",
+            ],
+            cflags: ["-DZSTD_MULTITHREAD=1"],
+        },
+    },
+}
+
+sh_binary {
+    name: "zstdgrep",
+    src: "programs/zstdgrep",
+    system_ext_specific: true,
+}
+
+sh_binary {
+    name: "zstdless",
+    src: "programs/zstdless",
+    system_ext_specific: true,
 }
 
 cc_defaults {