Merge "Rearrange deps in JavaLibrary.mk"