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
am: 5f1ba47e48

Change-Id: Ic71d301723f8b7c52d098ce8fd9531cf58d73727