Merge "Switching from ActivityInstrumentationTestCase2 to ActivityTestRule."