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

[maurizio.cimadamore at oracle.com]

Changeset: 7504ab477199
Author:    langtools
Date:      2017-05-10 17:25 +0200
URL:       http://hg.openjdk.java.net/amber/amber/langtools/rev/7504ab477199

Automatic merge with constant-folding