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

[maurizio.cimadamore at oracle.com]

Changeset: cf111201f5c9
Author:    langtools
Date:      2017-04-13 23:55 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/cf111201f5c9

Automatic merge with default

- src/jdk.internal.vm.compiler/share/classes/org.graalvm.compiler.test/src/org/graalvm/compiler/test/JLRModule.java
- test/runtime/modules/java.base/java/lang/reflect/ModuleHelper.java