hg: amber/amber: Automatic merge with condy

[maurizio.cimadamore at oracle.com]

Changeset: 171a4ea26b05
Author:    mcimadamore
Date:      2017-12-06 13:00 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/171a4ea26b05

Automatic merge with condy

! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java