git: openjdk/jdk: 8295697: Resolve conflicts between serviceability/jvmti and nsk/jvmti shared code

[Alex Menkov]

Changeset: 6240431b
Author:    Alex Menkov <amenkov at openjdk.org>
Date:      2022-10-20 23:41:54 +0000
URL:       https://git.openjdk.org/jdk/commit/6240431b381cd9327767cec03189aef55e23d8bd

8295697: Resolve conflicts between serviceability/jvmti and nsk/jvmti shared code

Reviewed-by: lmesnik, sspitsyn, cjplummer

! test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.cpp
! test/hotspot/jtreg/vmTestbase/nsk/share/jni/jni_tools.h
! test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.cpp
! test/hotspot/jtreg/vmTestbase/nsk/share/jvmti/JVMTITools.h
! test/lib/jdk/test/lib/jvmti/jvmti_common.h