[jdk17u-dev] RFR: 8312620: WSL Linux build crashes after JDK-8310233

[Thomas Stuefe]

Clean backport (based on https://github.com/openjdk/jdk17u-dev/pull/1695), fixes an issue where the build on Windows WSL was failing post-8310233.

-------------

Commit messages:
 - Backport 25058cd23ac9c8993e7acfd82728ee4c623f0914
 - Backport 94eb44b192ba421692549a178c386ea34164ea50

Changes: https://git.openjdk.org/jdk17u-dev/pull/1696/files
 Webrev: https://webrevs.openjdk.org/?repo=jdk17u-dev&pr=1696&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8312620
  Stats: 40 lines in 3 files changed: 20 ins; 2 del; 18 mod
  Patch: https://git.openjdk.org/jdk17u-dev/pull/1696.diff
  Fetch: git fetch https://git.openjdk.org/jdk17u-dev.git pull/1696/head:pull/1696

PR: https://git.openjdk.org/jdk17u-dev/pull/1696