Revert^2 "MethodHandle composability fix" am: 3b1b216094

Original change: https://android-review.googlesource.com/c/platform/art/+/1901532

Change-Id: Iaf243bece8ad57917ed73db878a0ad51ab7ddcfd