Merge "test: Fix 956-methodhandle-stackframe for javac/dx" am: 51448499d9
am: 72f1e2fb38

Change-Id: I33ce7920dfe3c8f7c192b2dd570eb70b61a5df3b