Merge "Don't check library variant identicalness for VNDK extensions" am: 7a833bdf2b am: 3bd0c2a219

Change-Id: I6570670027d06fa80cd282d2d33e1d3957175af6

cc/library.go

@@ -1104,7 +1104,7 @@ func (library *libraryDecorator) install(ctx ModuleContext, file android.Path) {
 			if ctx.isVndkSp() {
 				library.baseInstaller.subDir = "vndk-sp"
 			} else if ctx.isVndk() {
-				if !ctx.mustUseVendorVariant() {
+				if !ctx.mustUseVendorVariant() && !ctx.isVndkExt() {
 					library.checkSameCoreVariant = true
 					if ctx.DeviceConfig().VndkUseCoreVariant() {
 						library.useCoreVariant = true