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

Change-Id: I5ccdb58bbcde73a33bdce9b65d95aad2bf7b931f