Merge changes I059e639b,I4ebe1da8,Idf4fd37a,Id90082b5 into rvc-dev am: 2743c1def6

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

Change-Id: I62157287035bee39b902421c37cdd7e3213a6222

cc/testing.go

@@ -496,6 +496,7 @@ func TestConfig(buildDir string, os android.OsType, env map[string]string,
 		"my_include":  nil,
 		"foo.map.txt": nil,
 		"liba.so":     nil,
+		"libb.a":      nil,
 	}
 
 	GatherRequiredFilesForTest(mockFS)