diff --git a/frostwire-jlibtorrent/swig/build-android-arm.sh b/frostwire-jlibtorrent/swig/build-android-arm.sh
index 09b5564..09c182f 100755
--- a/frostwire-jlibtorrent/swig/build-android-arm.sh
+++ b/frostwire-jlibtorrent/swig/build-android-arm.sh
@@ -14,11 +14,10 @@ export SHARED_LIB=lib${LIBRARY_NAME}.so
 export CXX=g++
 export NDK_VERSION=r21d
 prepare_android_toolchain
-export ANDROID_TOOLCHAIN=${NDK}/toolchains/llvm/prebuilt/linux-x86_64
 abort_if_var_unset "ANDROID_TOOLCHAIN" ${ANDROID_TOOLCHAIN}
 export CC=${ANDROID_TOOLCHAIN}/bin/armv7a-linux-androideabi${android_api}-clang
 export run_openssl_configure="./Configure linux-${os_arch}v4 ${OPENSSL_NO_OPTS} -march=armv7-a -mfpu=neon -fPIC --prefix=${OPENSSL_ROOT}";
-mkdir -p bin/release/${os_build}/${os_arch}eabi-v7a/
+mkdir -p bin/release/${os_build}/${os_arch}eabi-v7a
 export run_readelf="${ANDROID_TOOLCHAIN}/bin/arm-linux-androideabi-readelf -d bin/release/${os_build}/${os_arch}eabi-v7a/${SHARED_LIB}"
 export run_bjam="${BOOST_ROOT}/b2 -j8 --user-config=config/${os_build}-${os_arch}-config.jam variant=release toolset=clang-linux-${os_arch} target-os=${os_build} location=bin/release/${os_build}/${os_arch}eabi-v7a"
 export run_strip="${ANDROID_TOOLCHAIN}/bin/arm-linux-androideabi-strip --strip-unneeded -x -g bin/release/${os_build}/${os_arch}eabi-v7a/${SHARED_LIB}"
diff --git a/frostwire-jlibtorrent/swig/build-android-arm64.sh b/frostwire-jlibtorrent/swig/build-android-arm64.sh
index c895ddc..e3a8178 100755
--- a/frostwire-jlibtorrent/swig/build-android-arm64.sh
+++ b/frostwire-jlibtorrent/swig/build-android-arm64.sh
@@ -14,10 +14,9 @@ export SHARED_LIB=lib${LIBRARY_NAME}.so
 export CXX=g++
 export NDK_VERSION=r21d
 prepare_android_toolchain
-export ANDROID_TOOLCHAIN=${NDK}/toolchains/llvm/prebuilt/linux-x86_64
 abort_if_var_unset "ANDROID_TOOLCHAIN" ${ANDROID_TOOLCHAIN}
 export CC=${ANDROID_TOOLCHAIN}/bin/aarch64-linux-android${android_api}-clang
-mkdir -p bin/release/${os_build}/${os_arch}-v8a/${SHARED_LIB}
+mkdir -p bin/release/${os_build}/${os_arch}-v8a
 export run_openssl_configure="./Configure linux-aarch64 ${OPENSSL_NO_OPTS} -march=armv8-a+crypto -mfpu=neon -fPIC --prefix=${OPENSSL_ROOT}";
 export run_readelf="${ANDROID_TOOLCHAIN}/bin/aarch64-linux-android-readelf -d bin/release/${os_build}/${os_arch}-v8a/${SHARED_LIB}"
 export run_bjam="${BOOST_ROOT}/b2 -j8 --user-config=config/${os_build}-${os_arch}-config.jam variant=release toolset=clang-${os_arch} target-os=${os_build} location=bin/release/${os_build}/${os_arch}-v8a"
@@ -52,6 +51,4 @@ else
         cp swig/bin/release/${os_build}/${os_arch}-v8a/${SHARED_LIB} ../torrentStream/src/main/jnLibs/${os_arch}-v8a/
         cd swig || exit
     fi
-fi
-
-
+fi
\ No newline at end of file
diff --git a/frostwire-jlibtorrent/swig/build-android-x86.sh b/frostwire-jlibtorrent/swig/build-android-x86.sh
index 910fb40..3c78946 100755
--- a/frostwire-jlibtorrent/swig/build-android-x86.sh
+++ b/frostwire-jlibtorrent/swig/build-android-x86.sh
@@ -14,9 +14,8 @@ export SHARED_LIB=lib${LIBRARY_NAME}.so
 export CXX=g++
 export NDK_VERSION=r21d
 prepare_android_toolchain
-export ANDROID_TOOLCHAIN=${NDK}/toolchains/llvm/prebuilt/linux-x86_64
 abort_if_var_unset "ANDROID_TOOLCHAIN" ${ANDROID_TOOLCHAIN}
-mkdir -p bin/release/${os_build}/${os_arch}/${SHARED_LIB}
+mkdir -p bin/release/${os_build}/${os_arch}
 export run_openssl_configure="./Configure linux-elf ${OPENSSL_NO_OPTS} -fPIC -mstackrealign --prefix=${OPENSSL_ROOT}"
 export run_readelf="${ANDROID_TOOLCHAIN}/bin/i686-linux-android-readelf -d bin/release/${os_build}/${os_arch}/${SHARED_LIB}"
 export run_bjam="${BOOST_ROOT}/b2 -j8 -q --debug-building --user-config=config/${os_build}-${os_arch}-config.jam variant=release toolset=clang-${os_arch} target-os=${os_build} location=bin/release/${os_build}/${os_arch}"
diff --git a/frostwire-jlibtorrent/swig/build-android-x86_64.sh b/frostwire-jlibtorrent/swig/build-android-x86_64.sh
index 440ca1b..e6576f6 100755
--- a/frostwire-jlibtorrent/swig/build-android-x86_64.sh
+++ b/frostwire-jlibtorrent/swig/build-android-x86_64.sh
@@ -14,9 +14,8 @@ export SHARED_LIB=lib${LIBRARY_NAME}.so
 export CXX=g++
 export NDK_VERSION=r21d
 prepare_android_toolchain
-export ANDROID_TOOLCHAIN=${NDK}/toolchains/llvm/prebuilt/linux-x86_64
 abort_if_var_unset "ANDROID_TOOLCHAIN" ${ANDROID_TOOLCHAIN}
-mkdir -p bin/release/${os_build}/${os_arch}/${SHARED_LIB}
+mkdir -p bin/release/${os_build}/${os_arch}
 export run_openssl_configure="./Configure linux-x86_64 ${OPENSSL_NO_OPTS} -fPIC -mstackrealign --prefix=${OPENSSL_ROOT}";
 export run_readelf="${ANDROID_TOOLCHAIN}/bin/i686-linux-android-readelf -d bin/release/${os_build}/${os_arch}/${SHARED_LIB}"
 export run_bjam="${BOOST_ROOT}/b2 -j8 --user-config=config/${os_build}-${os_arch}-config.jam variant=release toolset=clang-${os_arch} target-os=${os_build} location=bin/release/${os_build}/${os_arch}"