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

Change-Id: I12a6133de7ec7101327424854cf7a46debe3362d