More changes to support GraalVM 21.3.0#185

KengoTODA wants to merge 2 commits intomike-neck:mastermike-neck/graalvm-native-image-plugin:masterfrom

KengoTODA:graalvm-21.3.0KengoTODA/graalvm-native-image-plugin:graalvm-21.3.0Copy head branch name to clipboard