hg: amber/amber: manual merge with condy branch

[vicente.romero at oracle.com]

Changeset: 14015b37d62f
Author:    vromero
Date:      2017-12-15 11:10 -0500
URL:       http://hg.openjdk.java.net/amber/amber/rev/14015b37d62f

manual merge with condy branch

! make/CompileJavaModules.gmk
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java