libvpx: Pull from upstream

source/libvpx/vpx_dsp/x86/variance_impl_avx2.c

Index: source/libvpx/vpx_dsp/x86/variance_impl_avx2.c
diff --git a/source/libvpx/vp9/encoder/x86/vp9_variance_impl_intrin_avx2.c b/source/libvpx/vpx_dsp/x86/variance_impl_avx2.c
similarity index 98%
rename from source/libvpx/vp9/encoder/x86/vp9_variance_impl_intrin_avx2.c
rename to source/libvpx/vpx_dsp/x86/variance_impl_avx2.c
index f9923280a3424d4c31c90ef93e8c2978a24c879d..0e40959aa9d10b23f254dc541992474646e76d5c 100644
--- a/source/libvpx/vp9/encoder/x86/vp9_variance_impl_intrin_avx2.c
+++ b/source/libvpx/vpx_dsp/x86/variance_impl_avx2.c
@@ -10,7 +10,9 @@
 
 #include <immintrin.h>  // AVX2
 
-void vp9_get16x16var_avx2(const unsigned char *src_ptr,
+#include "./vpx_dsp_rtcd.h"
+
+void vpx_get16x16var_avx2(const unsigned char *src_ptr,
                           int source_stride,
                           const unsigned char *ref_ptr,
                           int recon_stride,
@@ -121,7 +123,7 @@ void vp9_get16x16var_avx2(const unsigned char *src_ptr,
     }
 }
 
-void vp9_get32x32var_avx2(const unsigned char *src_ptr,
+void vpx_get32x32var_avx2(const unsigned char *src_ptr,
                           int source_stride,
                           const unsigned char *ref_ptr,
                           int recon_stride,