Merge "Separate java source list generation into its own rule"