Fix #385 with gradle toolchain#535

itzg merged 2 commits intoitzg:masteritzg/mc-image-helper:masterfrom

Luke-Ed:fix-#385-with-gradle-toolchainLuke-Ed/mc-image-helper:fix-#385-with-gradle-toolchainCopy head branch name to clipboard