Merge "Rearrange java library outputs" am: 7b7363fffb
am: a4435a5025

Change-Id: I9185bea7f0233cf2007714ef5f787281972889d7