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