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

[maurizio.cimadamore at oracle.com]

Changeset: ab7efca4ea61
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-07-21 00:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/ab7efca4ea61

Automatic merge with constant-folding