Merge "Fix MethodHandle resolution for invoke-direct"