javac-wrapper: fixes after rebase and review

compiler/testData/cli/jvm/extraHelp.out

@@ -4,6 +4,7 @@ where advanced options include:
   -Xadd-modules=<module[,]>  Root modules to resolve in addition to the initial modules,
                              or all modules on the module path if <module> is ALL-MODULE-PATH
   -Xbuild-file=<path>        Path to the .xml build file to compile
+  -Xcompile-java             Reuse javac analysis and compile Java source files
   -Xdump-declarations-to=<path> Path to JSON file to dump Java to Kotlin declaration mappings
   -Xmultifile-parts-inherit  Compile multifile classes as a hierarchy of parts and facade
   -Xmodule-path=<path>       Paths where to find Java 9+ modules
@@ -22,12 +23,6 @@ where advanced options include:
   -Xskip-runtime-version-check Allow Kotlin runtime libraries of incompatible versions in the classpath
   -Xuse-javac                Use javac for Java source and class files analysis
   -Xuse-old-class-files-reading Use old class files reading implementation (may slow down the build and should be used in case of problems with the new implementation)
-  -Xcompile-java             Reuse javac analysis and compile Java source files
-  -Xjavac-arguments=<option[,]> Java compiler arguments
-  -Xload-jsr305-annotations  Load JSR-305 nullability annotations
-  -Xno-inline                Disable method inlining
-  -Xrepeat=<count>           Repeat compilation (for performance analysis)
-  -Xskip-metadata-version-check Load classes with bad metadata version anyway (incl. pre-release classes)
   -Xallow-kotlin-package     Allow compiling code in package 'kotlin'
   -Xcoroutines={enable|warn|error}
                              Enable coroutines or report warnings or errors on declarations and use sites of 'suspend' modifier