am 2e9a4db4: Merge "Don\'t kill the instrumentation test runner with an uncaught exception." into gingerbread

* commit '2e9a4db411f57369a1b37f640b722b3f0e24d3f5':
  Don't kill the instrumentation test runner with an uncaught exception.