[chromium-libs-media-freeworld: 4/8] merge