Merge "Replace -classpath with --class-loader-context for preopt" into oc-mr1-dev