Merge "Build: Move preopt classpath to private variable"