RFR: JDK-8293288: bootcycle build failure after JDK-8173605

[Joe Darcy]

In order to get the build-breakage fixed sooner, I'm re-sending out @DamonFool 's fix https://github.com/openjdk/jdk/pull/10135 under this PR.

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

Commit messages:
 - JDK-8293288: bootcycle build failure after JDK-8173605

Changes: https://git.openjdk.org/jdk/pull/10148/files
 Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=10148&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8293288
  Stats: 2 lines in 1 file changed: 1 ins; 0 del; 1 mod
  Patch: https://git.openjdk.org/jdk/pull/10148.diff
  Fetch: git fetch https://git.openjdk.org/jdk pull/10148/head:pull/10148

PR: https://git.openjdk.org/jdk/pull/10148