diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index cda7ad250..c6302cc8d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.4.0"
+agp = "8.4.2"
 kotlin = "1.9.0"
 kotlinxCoroutines = "1.6.4"
 junit = "4.13.2"
diff --git a/prefab/prefab-publishing/mylibrary/build.gradle b/prefab/prefab-publishing/mylibrary/build.gradle
index 6a1bf40ec..73ef7a8d9 100644
--- a/prefab/prefab-publishing/mylibrary/build.gradle
+++ b/prefab/prefab-publishing/mylibrary/build.gradle
@@ -15,7 +15,7 @@
  */
 
 plugins {
-   id  'ndksamples.android.library'
+    id 'ndksamples.android.library'
 }
 
 android {
@@ -47,13 +47,14 @@ android {
             headers "src/main/cpp/include"
         }
     }
-
-    // Avoid packing the unnecessary libraries into final AAR. For details
-    // refer to https://issuetracker.google.com/issues/168777344#comment5
-    // Note that if your AAR also contains Java/Kotlin APIs, you should not
-    // exclude libraries that are used by those APIs.
     packagingOptions {
-        exclude("**/libmylibrary.so")
-        exclude("**/libc++_shared.so")
+        // Avoid packing the unnecessary libraries into final AAR. For details
+        // refer to https://issuetracker.google.com/issues/168777344#comment5
+        // Note that if your AAR also contains Java/Kotlin APIs, you should not
+        // exclude libraries that are used by those APIs.
+        jniLibs {
+            excludes += ['**/libmylibrary.so', '**/libc++_shared.so']
+        }
     }
+
 }
diff --git a/unit-test/app/build.gradle b/unit-test/app/build.gradle
index 5e6d1480f..d7b63c55f 100644
--- a/unit-test/app/build.gradle
+++ b/unit-test/app/build.gradle
@@ -24,14 +24,14 @@ android {
         viewBinding true
         prefab true
     }
-
     packagingOptions {
         // Libraries that are wrongly included in the junit-gtest AAR that will
         // end up in our APK if we don't explicitly exclude them.
-        exclude "**/libadder.so"
-        exclude "**/libapptest.so"
-        exclude "**/libc++_shared.so"
+        jniLibs {
+            excludes += ['**/libadder.so', '**/libapptest.so', '**/libc++_shared.so']
+        }
     }
+
 }
 
 dependencies {