Merge "Cleanup stackmap generation in exception_test" am: 452e0ae7de
am: 20afe3b325

Change-Id: I5b14e8d1c5e49e0cfa54a32d0b0abb375b9631c1