hg: amber/amber: fixing merge issue

[vicente.romero at oracle.com]

Changeset: 2df2582d6ad0
Author:    vromero
Date:      2018-05-25 07:08 -0700
URL:       http://hg.openjdk.java.net/amber/amber/rev/2df2582d6ad0

fixing merge issue

! src/java.base/share/classes/java/lang/invoke/constant/ConstantDescs.java