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

[maurizio.cimadamore at oracle.com]

Changeset: 57f5a07d925c
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-23 00:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/57f5a07d925c

Automatic merge with constant-folding