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

Change-Id: Ic65edacbeca662a0247cee681d79e6bdf8208a08