Merge commit '7d26aca8452ce01ea33c0b03ecec392c07bf867b' * commit '7d26aca8452ce01ea33c0b03ecec392c07bf867b': Add support for @UiThreadTest on setUp() and tearDown() in InstrumentationTestCase.
Merge commit '7d26aca8452ce01ea33c0b03ecec392c07bf867b' * commit '7d26aca8452ce01ea33c0b03ecec392c07bf867b': Add support for @UiThreadTest on setUp() and tearDown() in InstrumentationTestCase.