[chromium-libs-media-freeworld: 54/85] merge