RFR: 8313438: [s390x] build broken after JDK-8301996 [v4]

[Amit Kumar]

> Build Fix after JDK-8301996. 
> 
> Warnings related to new Lightweight locking scheme are seen during the build phase, but we will get rid of them, after integrating #14414 . Testing done for `release-vm`, `slowdebug-vm`, `fastdebug-vm` and `optimized-vm`.
> 
> 3 Test failures seen on s390x are un-related to these changes.
> 
> jdk/jshell/ClassMembersTest.java
> java/lang/invoke/condy/CondyWrongType.java
> java/lang/invoke/condy/CondyWithGarbageTest.java
> 
> JBS issue for test failures: [JDK-8317581](https://bugs.openjdk.org/browse/JDK-8317581).

Amit Kumar has updated the pull request incrementally with one additional commit since the last revision:

  uses assert instead of if-statement

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

Changes:
  - all: https://git.openjdk.org/jdk/pull/15885/files
  - new: https://git.openjdk.org/jdk/pull/15885/files/f2afd8b7..deeb70ea

Webrevs:
 - full: https://webrevs.openjdk.org/?repo=jdk&pr=15885&range=03
 - incr: https://webrevs.openjdk.org/?repo=jdk&pr=15885&range=02-03

  Stats: 4 lines in 1 file changed: 0 ins; 0 del; 4 mod
  Patch: https://git.openjdk.org/jdk/pull/15885.diff
  Fetch: git fetch https://git.openjdk.org/jdk.git pull/15885/head:pull/15885

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