Java builds are broken

[Micah Kornfield]

I think some PRs I just merged had some unexpected conflicts.  Looking into
fixing them now.