[chromium-vaapi/f29: 12/12] FIX: Merge from master