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

This tree is empty.