Merge change 4654 into donut

* changes:
  Put the java source file list files somewhere where they don't conflict with the .class files that are getting zipped up, and delete them when we're done with them.