[chromium-freeworld: 10/32] Merge branch 'master' into f26