Merge change Ib3d582d7 into eclair-mr2

* changes:
  Fix crash with @UiThreadTest in InstrumentationTestCase.