hg: amber/amber: manual merge with default

[vicente.romero at oracle.com]

Changeset: 0bc0f9ac8a60
Author:    vromero
Date:      2019-06-13 18:59 -0400
URL:       http://hg.openjdk.java.net/amber/amber/rev/0bc0f9ac8a60

manual merge with default

- make/CreateBuildJdkCopy.gmk
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
- 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