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

[maurizio.cimadamore at oracle.com]

Changeset: 617e575aec74
Author:    langtools
Date:      2017-05-10 19:42 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/617e575aec74

Automatic merge with constant-folding