hg: amber/amber/langtools: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: c0d09307c205
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-30 00:02 +0200
URL:       http://hg.openjdk.java.net/amber/amber/langtools/rev/c0d09307c205

Automatic merge with default

! .hgtags
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
- test/tools/javac/modules/LegacyXModuleTest.java