Merge "Rearrange java library outputs" am: 7b7363fffb am: a4435a5025 am: 09018269a8
am: 99c83f2bda

Change-Id: Idbc589e26fa095c4be692acf601ec8873d0d3a8f