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

[maurizio.cimadamore at oracle.com]

Changeset: 7c8c9d0d7f82
Author:    langtools
Date:      2017-05-11 23:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/7c8c9d0d7f82

Automatic merge with constant-folding