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