Merge "replace vp8_ with vpx_ in vpx_scale"