Merge "Remove media-provider compat config from system image."