am f6120cf4: Merge "Improve InstrumentationTestRunner exception handling." into gingerbread

Merge commit 'f6120cf431804e072f34699a5d8a3fae62492cee' into gingerbread-plus-aosp

* commit 'f6120cf431804e072f34699a5d8a3fae62492cee':
  Improve InstrumentationTestRunner exception handling.