Merge "No symlink for host APEXes"
diff --git a/apex/apex.go b/apex/apex.go
index 6d4b17b..96a6dca 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -2327,6 +2327,11 @@
 		a.linkToSystemLib = false
 	}
 
+	// We also don't want the optimization for host APEXes, because it doesn't make sense.
+	if ctx.Host() {
+		a.linkToSystemLib = false
+	}
+
 	// prepare apex_manifest.json
 	a.buildManifest(ctx, provideNativeLibs, requireNativeLibs)