diff --git a/StubLibraries.bp b/StubLibraries.bp
index c80d134..5c5dae6 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -76,7 +76,18 @@
     name: "metalava-non-updatable-api-stubs-default",
     defaults: ["metalava-base-api-stubs-default"],
     sdk_version: "core_platform",
-    libs: ["framework-all"],
+    // There are a few classes from modules used as type arguments that
+    // need to be resolved by metalava. For now, we can use a previously
+    // finalized stub library to resolve them. If a new class gets added,
+    // this may be need to be revisited to use a manually maintained stub
+    // library with empty classes in order to resolve those references.
+    libs: ["sdk_system_29_android"],
+    aidl: {
+        local_include_dirs: [
+            "media/apex/java",
+            "wifi/aidl-export",
+        ],
+    },
 }
 
 /////////////////////////////////////////////////////////////////////
@@ -286,7 +297,7 @@
     name: "android_module_lib_stubs_current",
     srcs: [ ":module-lib-api-stubs-docs" ],
     defaults: ["android_defaults_stubs_current"],
-    libs: ["android_system_stubs_current"],
+    libs: ["sdk_system_29_android"],
 }
 
 /////////////////////////////////////////////////////////////////////