[chromium-libs-media-freeworld: 194/201] merge fix