Merge "Separate java source list generation into its own rule"
am: f61712fbf1

Change-Id: Ib69127b00bbdaf254dc68a8387b86d7533fde46b