Merge "move vp9_avg to vpx_dsp"