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

[maurizio.cimadamore at oracle.com]

Changeset: bbaaf0199065
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-08-18 00:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/bbaaf0199065

Automatic merge with constant-folding