Merge "Add additional optional audio/x-mpeg MIME type to MIME type map" into rvc-dev