RFR: 8340576: Some JVMCI flags are inconsistent

[Doug Simon]

This PR replaces some uses of `UseJVMCICompiler` with `EnableJVMCI` so that JVMCI code paths are taken when JVMCI is only used for non-CompilerBroker compilations.

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

Commit messages:
 - Merge branch 'master' into JDK-8340576
 - fix incorrect code in oopMap.inline.hpp
 - since UseJVMCICompiler implies EnableJVMCI, remove the latter from conjunctive tests of both
 - disentangle EnableJVMCI and UseJVMCICompiler

Changes: https://git.openjdk.org/jdk/pull/21120/files
  Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=21120&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8340576
  Stats: 15 lines in 8 files changed: 2 ins; 4 del; 9 mod
  Patch: https://git.openjdk.org/jdk/pull/21120.diff
  Fetch: git fetch https://git.openjdk.org/jdk.git pull/21120/head:pull/21120

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