Merge "Move classes.jar generation right below JarJar phase."