Merge "Replacing .yt extension MIME type mapping from application/vnd.youtube.yt to video/vnd.youtube.yt, but keep old mapping around for inferring extension only."
am: 7ef0f8c651

Change-Id: I34084700eff20967d06b92c933f1f9446fd9f8f6