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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with constant-folding