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

[maurizio.cimadamore at oracle.com]

Changeset: 6f3c5768486d
Author:    langtools
Date:      2017-05-11 01:43 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/6f3c5768486d

Automatic merge with constant-folding