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

[maurizio.cimadamore at oracle.com]

Changeset: d1ebf6be2215
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-18 22:12 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/d1ebf6be2215

Automatic merge with constant-folding