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

Change-Id: I891f675d7f6f5761b213e96845ced4e263bd059d