Merge "Don't kill the instrumentation test runner with an uncaught exception." into gingerbread