hg: amber/amber: manual merge with default

[vicente.romero at oracle.com]

Changeset: 962ea6072f11
Author:    vromero
Date:      2019-06-13 19:21 -0400
URL:       http://hg.openjdk.java.net/amber/amber/rev/962ea6072f11

manual merge with default

- make/CreateBuildJdkCopy.gmk
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Resolve.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java
- src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs-11v2-20a3.h
- test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/GCTest.java
- test/langtools/tools/javac/diags/examples/BreakAmbiguousTarget.java
- test/langtools/tools/javac/diags/examples/BreakComplexValueNoSwitchExpression.java
- test/langtools/tools/javac/diags/examples/BreakExprNotImmediate.java
- test/langtools/tools/javac/diags/examples/BreakMissingValue.java