Merge "Move classes.jar generation right below JarJar phase." am: 729a221a16 am: 32fc9a5c46
am: 46010dda39

Change-Id: Iea2acd5e5fc736ef933b1d50e1ca39c7c7890e19