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

[maurizio.cimadamore at oracle.com]

Changeset: 06384a05ea48
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-26 16:37 +0200
URL:       http://hg.openjdk.java.net/amber/amber/rev/06384a05ea48

Automatic merge with constant-folding

- make/Javadoc.gmk
- test/lib/jdk/test/lib/DynamicVMOption.java
- test/lib/jdk/test/lib/InMemoryJavaCompiler.java