diff --git a/android/layer/build.gradle b/android/layer/build.gradle
index e6208f1161..59687a017e 100644
--- a/android/layer/build.gradle
+++ b/android/layer/build.gradle
@@ -1,9 +1,9 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 34
+    compileSdkVersion 36
     namespace = 'com.lunarg.gfxreconstruct.layer'
-    ndkVersion = '26.3.11579264'
+    ndkVersion = '28.2.13676358'
     defaultConfig {
         minSdkVersion 26
         ndk {
@@ -36,6 +36,13 @@ android {
         }
     }
     buildTypes {
+        debug {
+            externalNativeBuild {
+                cmake {
+                    cppFlags "-O2", "-DNDEBUG"
+                }
+            }
+        }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
diff --git a/android/test/test_apps/launcher/build.gradle b/android/test/test_apps/launcher/build.gradle
index 401f383230..9cabb0223d 100644
--- a/android/test/test_apps/launcher/build.gradle
+++ b/android/test/test_apps/launcher/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 34
+    compileSdkVersion 36
     namespace = 'com.lunarg.gfxreconstruct.test.test_apps.test_launcher'
-    ndkVersion = '26.3.11579264'
+    ndkVersion = '28.2.13676358'
     defaultConfig {
         applicationId "com.lunarg.gfxreconstruct.test.test_apps.test_launcher"
         minSdkVersion 26
-        targetSdkVersion 33
+        targetSdkVersion 36
         versionCode 1
         versionName "1.0"
         ndk {
diff --git a/android/tools/multi-win-replay/build.gradle b/android/tools/multi-win-replay/build.gradle
index 5e98cc3ce8..85f3ae6398 100644
--- a/android/tools/multi-win-replay/build.gradle
+++ b/android/tools/multi-win-replay/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 34
+    compileSdkVersion 36
     namespace = 'com.lunarg.gfxreconstruct.replay'
-    ndkVersion = '26.3.11579264'
+    ndkVersion = '28.2.13676358'
     defaultConfig {
         applicationId "com.lunarg.gfxreconstruct.replay"
         minSdkVersion 26
-        targetSdkVersion 33
+        targetSdkVersion 36
         versionCode 1
         versionName "1.0"
         ndk {
diff --git a/android/tools/quest_replay/build.gradle b/android/tools/quest_replay/build.gradle
index ffa9c483d8..6c39ba948f 100644
--- a/android/tools/quest_replay/build.gradle
+++ b/android/tools/quest_replay/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 34
+    compileSdkVersion 36
     namespace = 'com.lunarg.gfxreconstruct.replay'
-    ndkVersion = '26.3.11579264'
+    ndkVersion = '28.2.13676358'
     defaultConfig {
         applicationId "com.lunarg.gfxreconstruct.replay"
         minSdkVersion 26
-        targetSdkVersion 33
+        targetSdkVersion 36
         versionCode 1
         versionName "1.0"
         ndk {
diff --git a/android/tools/replay/build.gradle b/android/tools/replay/build.gradle
index cdb615a2b0..9654c003ad 100644
--- a/android/tools/replay/build.gradle
+++ b/android/tools/replay/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 34
+    compileSdkVersion 36
     namespace = 'com.lunarg.gfxreconstruct.replay'
-    ndkVersion = '26.3.11579264'
+    ndkVersion = '28.2.13676358'
     defaultConfig {
         applicationId "com.lunarg.gfxreconstruct.replay"
         minSdkVersion 26
-        targetSdkVersion 33
+        targetSdkVersion 36
         versionCode 1
         versionName "1.0"
         ndk {
diff --git a/framework/application/android_context.cpp b/framework/application/android_context.cpp
index 5f0e4e6170..69233cb839 100644
--- a/framework/application/android_context.cpp
+++ b/framework/application/android_context.cpp
@@ -52,12 +52,12 @@ void AndroidContext::ProcessEvents(bool wait_for_input)
 
         if (wait_for_input)
         {
-            result         = ALooper_pollAll(-1, nullptr, &events, reinterpret_cast<void**>(&source));
+            result         = ALooper_pollOnce(-1, nullptr, &events, reinterpret_cast<void**>(&source));
             wait_for_input = false;
         }
         else
         {
-            result = ALooper_pollAll(0, nullptr, &events, reinterpret_cast<void**>(&source));
+            result = ALooper_pollOnce(0, nullptr, &events, reinterpret_cast<void**>(&source));
         }
 
         if (result >= 0)
diff --git a/framework/util/android/activity.cpp b/framework/util/android/activity.cpp
index 84d6eaebcb..06f57bc482 100644
--- a/framework/util/android/activity.cpp
+++ b/framework/util/android/activity.cpp
@@ -36,7 +36,7 @@ void DestroyActivity(struct android_app* app)
     {
         struct android_poll_source* source = nullptr;
         int                         events = 0;
-        int                         result = ALooper_pollAll(-1, nullptr, &events, reinterpret_cast<void**>(&source));
+        int                         result = ALooper_pollOnce(-1, nullptr, &events, reinterpret_cast<void**>(&source));
 
         if ((result >= 0) && (source))
         {
diff --git a/test/test_apps/common/test_app_base.cpp b/test/test_apps/common/test_app_base.cpp
index 8b7f849f96..f9db8c5869 100644
--- a/test/test_apps/common/test_app_base.cpp
+++ b/test/test_apps/common/test_app_base.cpp
@@ -2841,7 +2841,7 @@ void device_initialization_phase_1(application::Application& app, InitInfo& init
         {
             int                         events = 0;
             struct android_poll_source* source = nullptr;
-            int result = ALooper_pollAll(-1, nullptr, &events, reinterpret_cast<void**>(&source));
+            int result = ALooper_pollOnce(-1, nullptr, &events, reinterpret_cast<void**>(&source));
             if (result >= 0 && source)
             {
                 source->process(init.android_app, source);