hg: amber/amber/langtools: manual merge

[vicente.romero at oracle.com]

Changeset: 8c63a8fc7e7e
Author:    vromero
Date:      2017-05-26 10:26 -0400
URL:       http://hg.openjdk.java.net/amber/amber/langtools/rev/8c63a8fc7e7e

manual merge

! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Infer.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/Gen.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java