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