Avoid fixed newlines in --help messages.

Change-Id: Ibd3a177e88082aef9d66d553649e72c42384eb55

src/main/java/com/android/tools/r8/ApiDatabaseGeneratorCommandParser.java

diff --git a/src/main/java/com/android/tools/r8/ApiDatabaseGeneratorCommandParser.java b/src/main/java/com/android/tools/r8/ApiDatabaseGeneratorCommandParser.java
index 5eddeaa..7c4cfa8 100644
--- a/src/main/java/com/android/tools/r8/ApiDatabaseGeneratorCommandParser.java
+++ b/src/main/java/com/android/tools/r8/ApiDatabaseGeneratorCommandParser.java
@@ -7,12 +7,15 @@
 import com.android.tools.r8.utils.FlagFile;
 import com.android.tools.r8.utils.StringDiagnostic;
 import com.android.tools.r8.utils.internal.CliParser;
+import com.android.tools.r8.utils.internal.StringUtils;
 import java.nio.file.Paths;
 
 public class ApiDatabaseGeneratorCommandParser {
 
   private static CliParser<ApiDatabaseGeneratorCommand.Builder> createParser() {
-    String usageHeader = "Usage: apidatabasegenerator [options] <input-files>\nwhere options are:";
+    String usageHeader =
+        StringUtils.joinLines(
+            "Usage: apidatabasegenerator [options] <input-files>", "where options are:");
     CliParser<ApiDatabaseGeneratorCommand.Builder> parser = new CliParser<>(usageHeader);
     return parser
         .option0("--help", "Print help.", builder -> builder.setPrintHelp(true), "-h")

src/main/java/com/android/tools/r8/bisect/BisectOptions.java

diff --git a/src/main/java/com/android/tools/r8/bisect/BisectOptions.java b/src/main/java/com/android/tools/r8/bisect/BisectOptions.java
index 0b38e3a..312dc41 100644
--- a/src/main/java/com/android/tools/r8/bisect/BisectOptions.java
+++ b/src/main/java/com/android/tools/r8/bisect/BisectOptions.java
@@ -134,10 +134,10 @@
     System.out.println("--good <apk>      Known good APK.");
     System.out.println("--help");
     System.out.println("--output <dir>    Output directory.");
-    System.out.println(
-        "--result-bad      Bisect again assuming previous run was\n" + "        bad.");
-    System.out.println(
-        "--result-good     Bisect again assuming previous run was\n" + "        good.");
+    System.out.println("--result-bad      Bisect again assuming previous run was");
+    System.out.println("        bad.");
+    System.out.println("--result-good     Bisect again assuming previous run was");
+    System.out.println("        good.");
     System.out.println("--state <file>    Bisection state.");
   }
 }