Merge "Replace variants of 'vp8' and 'vp9' with 'vpx'" into nextgenv2