hg: amber/amber: fixing a merge issue plus additional tests failing

[vicente.romero at oracle.com]

Changeset: ecc13f6cc610
Author:    vromero
Date:      2018-06-15 11:14 -0700
URL:       http://hg.openjdk.java.net/amber/amber/rev/ecc13f6cc610

fixing a merge issue plus additional tests failing

! src/java.base/share/classes/java/lang/constant/DirectMethodHandleDesc.java
! src/java.base/share/classes/java/lang/constant/MethodHandleDesc.java
! test/langtools/tools/javac/specialConstantFolding/checkMethodTypeShape/MethodTypeNegTest.out
! test/langtools/tools/javac/specialConstantFolding/dead_code_elimination/DontDoDCEOfConstableTest.java
! test/langtools/tools/javac/specialConstantFolding/harness/tests/ConstantDefinitions.java
! test/langtools/tools/javac/specialConstantFolding/harness/tests/ConstantFoldingOfMethodTypeDiffContextsTest.java
! test/langtools/tools/javac/specialConstantFolding/harness/tests/ConstantPropagationTest.java
! test/langtools/tools/javac/specialConstantFolding/harness/tests/EffectivelyFinalTest.java
! test/langtools/tools/javac/specialConstantFolding/harness/tests/FindConstructorTest.java
! test/langtools/tools/javac/specialConstantFolding/harness/tests/FindGetterTest.java
! test/langtools/tools/javac/specialConstantFolding/harness/tests/FindMethodWithGenericArgumentsTest.java
! test/langtools/tools/javac/specialConstantFolding/harness/tests/FindSetterTest.java
! test/langtools/tools/javac/specialConstantFolding/harness/tests/FindStaticGetterTest.java
! test/langtools/tools/javac/specialConstantFolding/harness/tests/FindStaticSetterTest.java
! test/langtools/tools/javac/specialConstantFolding/harness/tests/FindStaticTest.java
! test/langtools/tools/javac/specialConstantFolding/harness/tests/FindVirtualTest01.java
! test/langtools/tools/javac/specialConstantFolding/harness/tests/FindVirtualTest02.java
! test/langtools/tools/javac/specialConstantFolding/harness/tests/InstanceTrackableMethodsTest.java
! test/langtools/tools/javac/specialConstantFolding/harness/tests/StringFoldingTest.java