Merge "Fix build when vp8 is disabled" into nextgenv2