Merge "Rearrange java library outputs"
am: 7b7363fffb

Change-Id: Ia0f975785542973a052cd0b24ee9c1b756babfe6