Merge Android 12

Bug: 202323961
Merged-In: I7925468342205f443949f502b8f87c7d73b83a00
Change-Id: Idf39a043f37c39d9aefa4d67246a099fc8fb8c70
diff --git a/src/aaudio/AAudioLoader.h b/src/aaudio/AAudioLoader.h
index a07c539..faadd05 100644
--- a/src/aaudio/AAudioLoader.h
+++ b/src/aaudio/AAudioLoader.h
@@ -60,7 +60,6 @@
 #define AAUDIO_STREAM_STATE_STARTED    static_cast<aaudio_stream_state_t>(StreamState::Started)
 #else
 #include <aaudio/AAudio.h>
-#include <android/ndk-version.h>
 #endif
 
 #ifndef __NDK_MAJOR__