Merge pull request #39 from comius:fix-java_toolchain-4.1.0

PiperOrigin-RevId: 353593184
Change-Id: I5df36089f4e99e43554065539afebf670cbdb7e6