Merge changes I059e639b,I4ebe1da8,Idf4fd37a,Id90082b5 am: 37ed5063e2

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1324103

Change-Id: I616bc3532a3450327ccdd4e61ba95ad4ed53d80a

cc/vendor_snapshot.go

@@ -924,6 +924,11 @@ func VendorSnapshotSourceMutator(ctx android.BottomUpMutatorContext) {
 		return
 	}
 
+	// .. and also filter out llndk library
+	if module.isLlndk(ctx.Config()) {
+		return
+	}
+
 	var snapshotMap *snapshotMap
 
 	if lib, ok := module.linker.(libraryInterface); ok {