diff --git a/android/buildAndroidBOINC-CI.sh b/android/buildAndroidBOINC-CI.sh
index 2131cea54c4..77ea558b21f 100755
--- a/android/buildAndroidBOINC-CI.sh
+++ b/android/buildAndroidBOINC-CI.sh
@@ -252,7 +252,6 @@ if [ $build_with_vcpkg = "yes" ]; then
         git -C $BUILD_DIR clone $VCPKG_LINK
     fi
     if [ ! -e /tmp/vcpkg_updated ]; then
-        git -C $VCPKG_ROOT reset --hard
         git -C $VCPKG_ROOT pull
         $VCPKG_ROOT/bootstrap-vcpkg.sh
         touch /tmp/vcpkg_updated
diff --git a/android/build_boinc_arm.sh b/android/build_boinc_arm.sh
index ecfd10e7305..da41b0546a2 100755
--- a/android/build_boinc_arm.sh
+++ b/android/build_boinc_arm.sh
@@ -81,7 +81,7 @@ if [ -n "$COMPILEBOINC" ]; then
 
     echo "Stripping Binaries"
     cd stage/usr/local/bin
-    arm-linux-androideabi-strip *
+    llvm-strip *
     cd ../../../../
 
     echo "Copy Assets"
diff --git a/android/build_boinc_arm64.sh b/android/build_boinc_arm64.sh
index da12695b6dd..3ad90b1f2ee 100755
--- a/android/build_boinc_arm64.sh
+++ b/android/build_boinc_arm64.sh
@@ -81,7 +81,7 @@ if [ -n "$COMPILEBOINC" ]; then
 
     echo "Stripping Binaries"
     cd stage/usr/local/bin
-    aarch64-linux-android-strip *
+    llvm-strip *
     cd ../../../../
 
     echo "Copy Assets"
diff --git a/android/build_boinc_x86.sh b/android/build_boinc_x86.sh
index 3691f0b184f..b57da06f350 100755
--- a/android/build_boinc_x86.sh
+++ b/android/build_boinc_x86.sh
@@ -81,7 +81,7 @@ if [ -n "$COMPILEBOINC" ]; then
 
     echo "Stripping Binaries"
     cd stage/usr/local/bin
-    i686-linux-android-strip *
+    llvm-strip *
     cd ../../../../
 
     echo "Copy Assets"
diff --git a/android/build_boinc_x86_64.sh b/android/build_boinc_x86_64.sh
index b55b6dfdae9..c1801ee62d1 100755
--- a/android/build_boinc_x86_64.sh
+++ b/android/build_boinc_x86_64.sh
@@ -81,7 +81,7 @@ if [ -n "$COMPILEBOINC" ]; then
 
     echo "Stripping Binaries"
     cd stage/usr/local/bin
-    x86_64-linux-android-strip *
+    llvm-strip *
     cd ../../../../
 
     echo "Copy Assets"
diff --git a/android/ci_build_libs_cmake.sh b/android/ci_build_libs_cmake.sh
index 67ecabe21cc..26afe5adfad 100755
--- a/android/ci_build_libs_cmake.sh
+++ b/android/ci_build_libs_cmake.sh
@@ -35,7 +35,7 @@ for TRIPLET in $TRIPLETS_LIST ; do
         export ANDROID_NDK_HOME=$NDK_ROOT
     fi
     BUILD_TRIPLET=build-$TRIPLET
-    cmake lib -B $BUILD_TRIPLET -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS=$VCPKG_PORTS/ports -DVCPKG_OVERLAY_TRIPLETS=$VCPKG_PORTS/triplets/ci -DVCPKG_TARGET_TRIPLET=$TRIPLET -DVCPKG_MANIFEST_DIR=lib/vcpkg_config_android -DVCPKG_INSTALL_OPTIONS=--clean-after-build
+    cmake lib -B $BUILD_TRIPLET -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS=$VCPKG_PORTS/ports -DVCPKG_OVERLAY_TRIPLETS=$VCPKG_PORTS/triplets/ci -DVCPKG_TARGET_TRIPLET=$TRIPLET -DVCPKG_INSTALL_OPTIONS=--clean-after-build
     cmake --build $BUILD_TRIPLET
 
     echo "\e[1;32m $TRIPLET done \e[0m"
diff --git a/android/ndk_common.sh b/android/ndk_common.sh
index 1c36f978e2b..9c8883ba725 100644
--- a/android/ndk_common.sh
+++ b/android/ndk_common.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export NDK_VERSION=21d
+export NDK_VERSION=22b
 export NDK_ARMV6_VERSION=15c
 export NDK_ROOT=$BUILD_DIR/android-ndk-r${NDK_VERSION}
 export NDK_ARMV6_ROOT=$BUILD_DIR/android-ndk-r${NDK_ARMV6_VERSION}
diff --git a/android/vcpkg_config_apps/vcpkg.json b/android/vcpkg_config_apps/vcpkg.json
index 9af8c9a00f6..41df54e8dae 100644
--- a/android/vcpkg_config_apps/vcpkg.json
+++ b/android/vcpkg_config_apps/vcpkg.json
@@ -1,7 +1,6 @@
 {
     "name": "boinc-apps",
     "version-string": "7.19.0",
-    "builtin-baseline":"bd1ef2df46303989eeb048eb7aa9b816aa46365e",
     "dependencies":
     [
         {
@@ -10,11 +9,5 @@
           "default-features": false
         },
         "rappture"
-    ],
-    "overrides": [
-        { 
-            "name": "openssl", 
-            "version-string": "1.1.1n" 
-        }
-    ]    
+    ]
 }
diff --git a/android/vcpkg_config_client/vcpkg.json b/android/vcpkg_config_client/vcpkg.json
index 6d2b503b891..a11a482227f 100644
--- a/android/vcpkg_config_client/vcpkg.json
+++ b/android/vcpkg_config_client/vcpkg.json
@@ -1,7 +1,6 @@
 {
     "name": "boinc-client",
     "version-string": "7.19.0",
-    "builtin-baseline":"bd1ef2df46303989eeb048eb7aa9b816aa46365e",
     "dependencies":
     [
         {
@@ -9,11 +8,5 @@
           "features": ["openssl"],
           "default-features": false
         }
-    ],
-    "overrides": [
-        { 
-            "name": "openssl", 
-            "version-string": "1.1.1n" 
-        }
-    ]    
+    ]
 }
diff --git a/android/vcpkg_config_libs/vcpkg.json b/android/vcpkg_config_libs/vcpkg.json
index 672745fc88f..184a0d589ed 100644
--- a/android/vcpkg_config_libs/vcpkg.json
+++ b/android/vcpkg_config_libs/vcpkg.json
@@ -1,7 +1,6 @@
 {
     "name": "boinc-libs",
     "version-string": "7.19.0",
-    "builtin-baseline":"bd1ef2df46303989eeb048eb7aa9b816aa46365e",
     "dependencies":
     [
         {
@@ -9,11 +8,5 @@
           "features": ["openssl"],
           "default-features": false
         }
-    ],
-    "overrides": [
-        { 
-            "name": "openssl", 
-            "version-string": "1.1.1n" 
-        }
-    ]    
+    ]
 }
diff --git a/lib/vcpkg_config_android/vcpkg.json b/lib/vcpkg_config_android/vcpkg.json
deleted file mode 100644
index 3741e30d3dd..00000000000
--- a/lib/vcpkg_config_android/vcpkg.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "name": "boinc-libs",
-    "version-string": "7.19.0",
-    "builtin-baseline":"bd1ef2df46303989eeb048eb7aa9b816aa46365e",
-    "dependencies":
-    [
-        "openssl"
-    ],
-    "overrides": [
-        { 
-            "name": "openssl", 
-            "version-string": "1.1.1n" 
-        }
-    ]    
-}