hg: amber/amber: fixing merge issues

[vicente.romero at oracle.com]

Changeset: 64a9225f91bf
Author:    vromero
Date:      2019-10-20 11:14 -0400
URL:       https://hg.openjdk.java.net/amber/amber/rev/64a9225f91bf

fixing merge issues

! test/langtools/tools/javac/expswitch/ExpSwitchNestingTest.java
! test/langtools/tools/javac/lambda/bridge/template_tests/BridgeMethodTestCase.java
! test/langtools/tools/javac/tree/JavacTreeScannerTest.java
! test/langtools/tools/javac/tree/SourceTreeScannerTest.java