hg: amber/amber/hotspot: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: ff66e4b8ff2e
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-30 00:01 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/ff66e4b8ff2e

Automatic merge with default

! src/jdk.internal.vm.ci/share/classes/jdk.vm.ci.hotspot/src/jdk/vm/ci/hotspot/CompilerToVM.java
! src/share/vm/prims/jvm.h
- test/runtime/modules/JVMAddModulePackage.java