Defined(COMPILER2) || INCLUDE_JVMCI changed replaced with COMPILER2_OR_JVMCI Reviewed-by: kvn
Reviewed-by: darcy, ihse