Merge "Fix various classpath issues in Jack projects" into jack-wip-dev