Merge "Build against SDKs for native libs only for unbundled apps." am: c38936add4 am: d3c16f2c37

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

Change-Id: Id7160e4a927bb5ac85354fa8167b3d0a046eaf6b

cc/sdk.go

@@ -41,7 +41,7 @@ func sdkMutator(ctx android.BottomUpMutatorContext) {
 			modules[0].(*Module).Properties.Sdk_version = nil
 			modules[1].(*Module).Properties.IsSdkVariant = true
 
-			if ctx.Config().UnbundledBuild() {
+			if ctx.Config().UnbundledBuildApps() {
 				modules[0].(*Module).Properties.HideFromMake = true
 				modules[0].(*Module).Properties.PreventInstall = true
 			} else {