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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with constant-folding