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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with constant-folding