RISC-V: Avoid using JDK20 as boot JDK for JDK21

RISC-V: Avoid using JDK20 as boot JDK for JDK21 #817