Merge "MethodHandles: Remove obsolete test workaround."
am: e7b46e22c7

Change-Id: Ibdb69597fb95ccc1840c25df850b29c628a64763