Merge "Improve InstrumentationTestRunner exception handling." into gingerbread