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

[maurizio.cimadamore at oracle.com]

Changeset: dfc79b7c2eb6
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-17 01:07 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/dfc79b7c2eb6

Automatic merge with constant-folding