libvpx: Pull from upstream

source/libvpx/vpx_dsp/x86/highbd_variance_impl_sse2.asm

Index: source/libvpx/vpx_dsp/x86/highbd_variance_impl_sse2.asm
diff --git a/source/libvpx/vp9/encoder/x86/vp9_highbd_variance_impl_sse2.asm b/source/libvpx/vpx_dsp/x86/highbd_variance_impl_sse2.asm
similarity index 97%
rename from source/libvpx/vp9/encoder/x86/vp9_highbd_variance_impl_sse2.asm
rename to source/libvpx/vpx_dsp/x86/highbd_variance_impl_sse2.asm
index 821dd0660bcfc586cce54d0caacfbb7c59b5c234..923418a99215142545a7377695088c27e019c3f6 100644
--- a/source/libvpx/vp9/encoder/x86/vp9_highbd_variance_impl_sse2.asm
+++ b/source/libvpx/vpx_dsp/x86/highbd_variance_impl_sse2.asm
@@ -11,7 +11,7 @@
 
 %include "vpx_ports/x86_abi_support.asm"
 
-;unsigned int vp9_highbd_calc16x16var_sse2
+;unsigned int vpx_highbd_calc16x16var_sse2
 ;(
 ;    unsigned char   *  src_ptr,
 ;    int             source_stride,
@@ -20,8 +20,8 @@
 ;    unsigned int    *  SSE,
 ;    int             *  Sum
 ;)
-global sym(vp9_highbd_calc16x16var_sse2) PRIVATE
-sym(vp9_highbd_calc16x16var_sse2):
+global sym(vpx_highbd_calc16x16var_sse2) PRIVATE
+sym(vpx_highbd_calc16x16var_sse2):
     push        rbp
     mov         rbp, rsp
     SHADOW_ARGS_TO_STACK 6
@@ -164,7 +164,7 @@ sym(vp9_highbd_calc16x16var_sse2):
     ret
 
 
-;unsigned int vp9_highbd_calc8x8var_sse2
+;unsigned int vpx_highbd_calc8x8var_sse2
 ;(
 ;    unsigned char   *  src_ptr,
 ;    int             source_stride,
@@ -173,8 +173,8 @@ sym(vp9_highbd_calc16x16var_sse2):
 ;    unsigned int    *  SSE,
 ;    int             *  Sum
 ;)
-global sym(vp9_highbd_calc8x8var_sse2) PRIVATE
-sym(vp9_highbd_calc8x8var_sse2):
+global sym(vpx_highbd_calc8x8var_sse2) PRIVATE
+sym(vpx_highbd_calc8x8var_sse2):
     push        rbp
     mov         rbp, rsp
     SHADOW_ARGS_TO_STACK 6