diff --git a/android/wolfcryptjni-ndk-gradle/wolfcrypt-jni b/android/wolfcryptjni-ndk-gradle/wolfcrypt-jni
index e575891b..3158aa8c 160000
--- a/android/wolfcryptjni-ndk-gradle/wolfcrypt-jni
+++ b/android/wolfcryptjni-ndk-gradle/wolfcrypt-jni
@@ -1 +1 @@
-Subproject commit e575891b966ac7028cd5f429eda7df6b24a9b129
+Subproject commit 3158aa8c700ceb8f33c98972edb392f1596a213f
diff --git a/android/wolfcryptjni-ndk-gradle/wolfssl b/android/wolfcryptjni-ndk-gradle/wolfssl
index fb704774..d1efccd2 160000
--- a/android/wolfcryptjni-ndk-gradle/wolfssl
+++ b/android/wolfcryptjni-ndk-gradle/wolfssl
@@ -1 +1 @@
-Subproject commit fb704774a0e961685e1c082ea13b3e71a4c0d953
+Subproject commit d1efccd2594dbc7ed15763d5ad6f5c114a7afaae
diff --git a/android/wolfssljni-ndk-gradle/app/CMakeLists.txt b/android/wolfssljni-ndk-gradle/app/CMakeLists.txt
index 9bcf0d3e..0b06f516 100644
--- a/android/wolfssljni-ndk-gradle/app/CMakeLists.txt
+++ b/android/wolfssljni-ndk-gradle/app/CMakeLists.txt
@@ -60,6 +60,9 @@ if ("${WOLFSSL_PKG_TYPE}" MATCHES "normal")
         -DTFM_TIMING_RESISTANT -DECC_TIMING_RESISTANT
         -DHAVE_AESGCM -DSIZEOF_LONG=4 -DSIZEOF_LONG_LONG=8
 
+        # For gethostbyname()
+        -DHAVE_NETDB_H
+
         # Defines added for debugging. These can be removed if debug logging is not needed
         # and will increase performance and reduce library footprint size if removed.
         -DDEBUG_WOLFSSL -DWOLFSSL_ANDROID_DEBUG
@@ -158,6 +161,9 @@ elseif("${WOLFSSL_PKG_TYPE}" MATCHES "fipsready")
             -DKEEP_PEER_CERT -DSESSION_CERTS
             -DSIZEOF_LONG=4 -DSIZEOF_LONG_LONG=8
 
+            # For gethostbyname()
+            -DHAVE_NETDB_H
+
             # Enable below options for wolfSSL debug logging
             #-DDEBUG_WOLFSSL -DWOLFSSL_ANDROID_DEBUG
 
@@ -216,6 +222,7 @@ list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/pk.c)
 list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/ssl_bn.c)
 list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/ssl_asn1.c)
 list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/ssl_certman.c)
+list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/ssl_crypto.c)
 list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/ssl_misc.c)
 list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/x509.c)
 list(REMOVE_ITEM TLS_SOURCES ${wolfssl_DIR}/src/x509_str.c)
@@ -278,15 +285,17 @@ add_library(wolfssl SHARED
 # wolfSSL JNI/JSSE library wil be compiled as SHARED library
 # wolfSSL JNI Java files are tied into build in Module build.gradle file
 add_library(wolfssljni SHARED
+            ${wolfssljni_DIR}/native/com_wolfssl_WolfSSL.c
+            ${wolfssljni_DIR}/native/com_wolfssl_WolfSSLCertManager.c
+            ${wolfssljni_DIR}/native/com_wolfssl_WolfSSLCertRequest.c
+            ${wolfssljni_DIR}/native/com_wolfssl_WolfSSLCertificate.c
+            ${wolfssljni_DIR}/native/com_wolfssl_WolfSSLContext.c
+            ${wolfssljni_DIR}/native/com_wolfssl_WolfSSLSession.c
+            ${wolfssljni_DIR}/native/com_wolfssl_WolfSSLX509Name.c
+            ${wolfssljni_DIR}/native/com_wolfssl_WolfSSLX509StoreCtx.c
             ${wolfssljni_DIR}/native/com_wolfssl_wolfcrypt_ECC.c
             ${wolfssljni_DIR}/native/com_wolfssl_wolfcrypt_EccKey.c
             ${wolfssljni_DIR}/native/com_wolfssl_wolfcrypt_RSA.c
-            ${wolfssljni_DIR}/native/com_wolfssl_WolfSSL.c
-            ${wolfssljni_DIR}/native/com_wolfssl_WolfSSLCertificate.c
-            ${wolfssljni_DIR}/native/com_wolfssl_WolfSSLCertManager.c
-            ${wolfssljni_DIR}/native/com_wolfssl_WolfSSLContext.c
-            ${wolfssljni_DIR}/native/com_wolfssl_WolfSSLSession.c
-            ${wolfssljni_DIR}/native/com_wolfssl_WolfSSLX509StoreCtx.c
            )
 
 # Native library to hold sources for wolfCrypt test application. These include the
diff --git a/android/wolfssljni-ndk-gradle/build.gradle b/android/wolfssljni-ndk-gradle/build.gradle
index af7baa79..ddb0cd43 100644
--- a/android/wolfssljni-ndk-gradle/build.gradle
+++ b/android/wolfssljni-ndk-gradle/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.2'
+        classpath 'com.android.tools.build:gradle:8.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/android/wolfssljni-ndk-gradle/gradle/wrapper/gradle-wrapper.properties b/android/wolfssljni-ndk-gradle/gradle/wrapper/gradle-wrapper.properties
index d9523497..072885d5 100644
--- a/android/wolfssljni-ndk-gradle/gradle/wrapper/gradle-wrapper.properties
+++ b/android/wolfssljni-ndk-gradle/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon May 23 13:47:02 MDT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/android/wolfssljni-ndk-gradle/wolfssl b/android/wolfssljni-ndk-gradle/wolfssl
index a4f55b01..d1efccd2 160000
--- a/android/wolfssljni-ndk-gradle/wolfssl
+++ b/android/wolfssljni-ndk-gradle/wolfssl
@@ -1 +1 @@
-Subproject commit a4f55b01d62fddec602edaae6a2a1df54441b3da
+Subproject commit d1efccd2594dbc7ed15763d5ad6f5c114a7afaae
diff --git a/android/wolfssljni-ndk-gradle/wolfssljni b/android/wolfssljni-ndk-gradle/wolfssljni
index 3420a391..60887c63 160000
--- a/android/wolfssljni-ndk-gradle/wolfssljni
+++ b/android/wolfssljni-ndk-gradle/wolfssljni
@@ -1 +1 @@
-Subproject commit 3420a39169d08ffb491d8e6677f03e8dea844a17
+Subproject commit 60887c63ba547055e7d0f5012c3f278ca5ee4eb6
diff --git a/android/wolfssljni-ndk-sample/wolfssl b/android/wolfssljni-ndk-sample/wolfssl
index fb704774..d1efccd2 160000
--- a/android/wolfssljni-ndk-sample/wolfssl
+++ b/android/wolfssljni-ndk-sample/wolfssl
@@ -1 +1 @@
-Subproject commit fb704774a0e961685e1c082ea13b3e71a4c0d953
+Subproject commit d1efccd2594dbc7ed15763d5ad6f5c114a7afaae
diff --git a/android/wolfssljni-ndk-sample/wolfssljni b/android/wolfssljni-ndk-sample/wolfssljni
index 6e912230..60887c63 160000
--- a/android/wolfssljni-ndk-sample/wolfssljni
+++ b/android/wolfssljni-ndk-sample/wolfssljni
@@ -1 +1 @@
-Subproject commit 6e91223031fd5c1ef21c830687bb429721e90655
+Subproject commit 60887c63ba547055e7d0f5012c3f278ca5ee4eb6