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

[maurizio.cimadamore at oracle.com]

Changeset: 4eafc4334776
Author:    langtools
Date:      2017-05-04 16:40 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/4eafc4334776

Automatic merge with constant-folding