Merge "test: Fix 956-methodhandle-stackframe for javac/dx"