diff --git a/cc/cc.go b/cc/cc.go
index f107968ec..5111bd2a7 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1674,6 +1674,11 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
 			// they merely serve as Make dependencies and do not affect this lib itself.
 			c.Properties.AndroidMkSharedLibs = append(
 				c.Properties.AndroidMkSharedLibs, makeLibName(depName))
+		case ndkStubDepTag, ndkLateStubDepTag:
+			ndkStub := ccDep.linker.(*stubDecorator)
+			c.Properties.AndroidMkSharedLibs = append(
+				c.Properties.AndroidMkSharedLibs,
+				depName+"."+ndkStub.properties.ApiLevel)
 		case staticDepTag, staticExportDepTag, lateStaticDepTag:
 			c.Properties.AndroidMkStaticLibs = append(
 				c.Properties.AndroidMkStaticLibs, makeLibName(depName))
diff --git a/cc/prebuilt.go b/cc/prebuilt.go
index 4446ab3ea..686a85a32 100644
--- a/cc/prebuilt.go
+++ b/cc/prebuilt.go
@@ -59,11 +59,7 @@ var _ prebuiltLinkerInterface = (*prebuiltLibraryLinker)(nil)
 func (p *prebuiltLibraryLinker) linkerInit(ctx BaseModuleContext) {}
 
 func (p *prebuiltLibraryLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
-	// export_header_lib_headers needs to be passed along
-	return Deps{
-		HeaderLibs:               p.baseLinker.Properties.Header_libs,
-		ReexportHeaderLibHeaders: p.baseLinker.Properties.Export_header_lib_headers,
-	}
+	return p.libraryDecorator.linkerDeps(ctx, deps)
 }
 
 func (p *prebuiltLibraryLinker) linkerFlags(ctx ModuleContext, flags Flags) Flags {