Merge "Rearrange java library outputs"