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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with constant-folding