Merge "Remove legacy InstrumentationTestRunner from cts media tests, so they run with proper AndroidJUnitRunner."