Merge "Cleanup a.t.InstrumentationTestRunner"
am: 9d5576e081

Change-Id: I376079be6f5e56adf51fec62ed3f89969029c0a1