[13u] RFR: 8235243 and 8235325

[Andrew Brygin]

Hello,

 I would like to backport following changes into 13u:

Bug: https://bugs.openjdk.java.net/browse/JDK-8235243
Original change: https://hg.openjdk.java.net/jdk/jdk/rev/775b714a2e49
Webrev: http://cr.openjdk.java.net/~bae/13u/8235243/webrev.00/

Bug: https://bugs.openjdk.java.net/browse/JDK-8235325
Original change: https://hg.openjdk.java.net/jdk/jdk/rev/cfc005b8a117
Webrev: http://cr.openjdk.java.net/~bae/13u/8235325/webrev.00/

 The fix for 8235325 resolves a build failure caused by the fix for
8235243, so it seems to be reasonable to join them into single review
request.

 Both changes are exactly same as for 14, but should be applied to a
different file: vm_version.cpp instead of abstract_vm_version.cpp,
because fix for 8233787, which introduces the abstract_vm_version.cpp,
is not backported to 13u.

Thanks,
Andrew