Merge "Remove compatibility rules for old /data/media type."