[chromium-vaapi/f29: 2/2] Merge branch 'master' into f29