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

Change-Id: I677e57eddb69fb62f0872a94fac854e9f8a31ed8