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

Change-Id: If9877a1438cb6c6abb31eda07ff5344270e00f6a