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

[maurizio.cimadamore at oracle.com]

Changeset: 1eb4e739c2f7
Author:    langtools
Date:      2017-05-11 00:23 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/1eb4e739c2f7

Automatic merge with constant-folding