Merge "Make exception test more robust against dex changes."