Merge "Cleanup a.t.InstrumentationTestRunner"