Merge change Id432656e into eclair-mr2

* changes:
  Add support for @UiThreadTest on setUp() and tearDown() in InstrumentationTestCase.