Merge "Replace -classpath with --class-loader-context for preopt"