Merge "Convert Media unit tests from push-file to MediaPreparer"