Merge "Separate java source list generation into its own rule" am: f61712fbf1 am: bf386cafec am: 1770c0cc2b
am: c1ca2cfbf4

Change-Id: I72f71307d592b67b2a4dc10ca650c011d68da866