[canl-java] More dep fixups.