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

Change-Id: I6d1de1dcb677e6c2c85c75fe8c5166b07cf713dd