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

[maurizio.cimadamore at oracle.com]

Changeset: 251e5b934353
Author:    langtools
Date:      2017-05-10 08:38 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/251e5b934353

Automatic merge with constant-folding