hg: amber/amber/jdk: Automatic merge with constant-folding

[maurizio.cimadamore at oracle.com]

Changeset: 34a19af95a64
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-07-14 00:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/34a19af95a64

Automatic merge with constant-folding

! src/java.base/share/classes/java/lang/invoke/MethodHandles.java
- test/java/lang/System/MacEncoding/MacJNUEncoding.sh