Merge "Refactor dexing"
diff --git a/java/jacoco.go b/java/jacoco.go
index 59f2fd3..e6da5a6 100644
--- a/java/jacoco.go
+++ b/java/jacoco.go
@@ -28,7 +28,8 @@
 var (
 	jacoco = pctx.AndroidStaticRule("jacoco", blueprint.RuleParams{
 		Command: `${config.Zip2ZipCmd} -i $in -o $strippedJar $stripSpec && ` +
-			`${config.JavaCmd} -jar ${config.JacocoCLIJar} instrument -quiet -dest $instrumentedJar $strippedJar && ` +
+			`${config.JavaCmd} -jar ${config.JacocoCLIJar} ` +
+			`  instrument --quiet --dest $instrumentedJar $strippedJar && ` +
 			`${config.Ziptime} $instrumentedJar && ` +
 			`${config.MergeZipsCmd} --ignore-duplicates -j $out $instrumentedJar $in`,
 		CommandDeps: []string{