Merge changes from topic "reland-rust-sbox-1" into main am: ec59517f6a am: fcf6a3c1d4

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

Change-Id: I7ffa6615a9fa4a272fd3571c6a95ce9efe7d9661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

android/rule_builder.go

@@ -756,9 +756,13 @@ func (r *RuleBuilder) build(name string, desc string, ninjaEscapeCommandString b
 		pool = localPool
 	}
 
+	if ninjaEscapeCommandString {
+		commandString = proptools.NinjaEscape(commandString)
+	}
+
 	r.ctx.Build(r.pctx, BuildParams{
 		Rule: r.ctx.Rule(r.pctx, name, blueprint.RuleParams{
-			Command:        proptools.NinjaEscape(commandString),
+			Command:        commandString,
 			CommandDeps:    proptools.NinjaEscapeList(tools.Strings()),
 			Restat:         r.restat,
 			Rspfile:        proptools.NinjaEscape(rspFile),