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

[maurizio.cimadamore at oracle.com]

Changeset: 52bcd25deecd
Author:    langtools
Date:      2017-05-13 00:18 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/52bcd25deecd

Automatic merge with constant-folding