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

[maurizio.cimadamore at oracle.com]

Changeset: 489df0b73214
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-30 00:04 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/489df0b73214

Automatic merge with constant-folding