Merge "Remove unused a.t.InstrumentationCoreTestRunner"
am: 1bfccadc81

Change-Id: Id624c17f7d5da6fa81cfac9a21726042b793c270