[lworld] RFR: 8378212: [lworld] Cleanup accidental diffs with master - step 1

[Tobias Hartmann]

This reverts some accidental changes to align closer with mainline.

Thanks,
Tobias

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

Commit messages:
 - 8378097: [lworld] Cleanup accidental diffs with master

Changes: https://git.openjdk.org/valhalla/pull/2127/files
  Webrev: https://webrevs.openjdk.org/?repo=valhalla&pr=2127&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8378212
  Stats: 67 lines in 21 files changed: 11 ins; 43 del; 13 mod
  Patch: https://git.openjdk.org/valhalla/pull/2127.diff
  Fetch: git fetch https://git.openjdk.org/valhalla.git pull/2127/head:pull/2127

PR: https://git.openjdk.org/valhalla/pull/2127