Merge "Remove support for --classpath and make --runtime-init the default."