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

Change-Id: I3ca3f23c2f8a741daf867aad08f57bac373e5d91