Merge "Revert "Add servicetests/media to TEST_MAPPING""