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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with constant-folding