[chromium-libs-media-freeworld: 54/259] Merge branch 'master' into f26