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

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