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

Change-Id: I8ec274133103af9d0601765ed1bafe637043558f