Merge "Switch android.webkit.MimeTypeMap over to libcore.net.MimeUtils' table."