Merge "Move classes.jar generation right below JarJar phase."
am: 729a221a16

Change-Id: I65352f033cdb64dd08dc1e0ab82bc2bbec6e8591