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