More java_tools updates (#1771)

2 files changed