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

Change-Id: I7c69c8b613357541d0a9bd5b3aec1c6ecc68e8c3