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

[maurizio.cimadamore at oracle.com]

Changeset: 2d70bf673bdb
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-16 11:45 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/2d70bf673bdb

Automatic merge with constant-folding