RFR: 8u backport of JDK-8239886 Minimal VM build fails after JDK-8237499

[Yang Yi]

Hi,

Please help review this minor backport. 

This is a follow-up backport. As mentioned[1] before, the 
minimized VM fails to build after backporting of JDK-8237499[2], 
this backport[3] solves the problem, it has only a few line changes.

Webrev: http://cr.openjdk.java.net/~ddong/yiyang/8239886/

Thanks,
Yang Yi

----
[1] https://mail.openjdk.java.net/pipermail/jdk8u-dev/2021-January/013343.html
[2] https://bugs.openjdk.java.net/browse/JDK-8237499
[3] https://bugs.openjdk.java.net/browse/JDK-8239886