Merge "Cleanup stackmap generation in exception_test"