Merge "Add servicetests/media to TEST_MAPPING"