Merge "Make exception test more robust against dex changes."
am: 8f8c5c50a1

Change-Id: Icf668f6f45264249758f80c31c27cefbe83eed17