8146660: Resolve merge issue in resulting from sun.misc.VM move to jdk.internal.misc

Reviewed-by: twisti, erikj, chegar

hotspot/make/gensrc/Gensrc-jdk.vm.ci.gmk

@@ -69,6 +69,7 @@ $(GENSRC_DIR)/_gensrc_proc_done: $(PROC_SRCS) \
 	$(eval $(call ListPathsSafely,PROC_SRCS,$(@D)/_gensrc_proc_files))
 	$(JAVA_SMALL) $(NEW_JAVAC) \
 	    -XDignore.symbol.file \
+            -bootclasspath $(JDK_OUTPUTDIR)/modules/java.base \
 	    -sourcepath $(SOURCEPATH) \
 	    -implicit:none \
 	    -proc:only \

hotspot/src/jdk.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/HotSpotJVMCIRuntime.java

@@ -49,7 +49,7 @@ import jdk.vm.ci.runtime.JVMCI;
 import jdk.vm.ci.runtime.JVMCIBackend;
 import jdk.vm.ci.runtime.JVMCICompiler;
 import jdk.vm.ci.service.Services;
-import sun.misc.VM;
+import jdk.internal.misc.VM;
 
 //JaCoCo Exclude