Merge "more cleanup of vp8 and vp9" into nextgenv2