bbfe0b2264
Merge commit '243f7f85ea9e57716590b9cf355e55d1f0236fce' * commit '243f7f85ea9e57716590b9cf355e55d1f0236fce': Improve InstrumentationTestRunner exception handling.