hg: amber/amber: Automatic merge with default

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default

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