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

Change-Id: Ic9b861c924d1f613cafe743747ea8f9ae7846ff1