hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default

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