hg: amber/amber/langtools: manual merge

[vicente.romero at oracle.com]

Changeset: 3d13a9d62572
Author:    vromero
Date:      2017-06-15 20:59 -0400
URL:       http://hg.openjdk.java.net/amber/amber/langtools/rev/3d13a9d62572

manual merge

- make/src/classes/build/tools/listjdkinternals/ListJDKInternals.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/LayoutParser.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/XMLNode.java
- src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclet.xml