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

Change-Id: I922e114d3b749e2042038dd552a7d56a1b6b2eb8