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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with constant-folding