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

Change-Id: Ie57ca13614695546c934216b94246e4a82b55218