[chromium-vaapi/f29] (2 commits) ...Merge branch 'master' into f29