libvpx: Pull from upstream

source/libvpx/vpx_dsp/x86/sad4d_sse2.asm

Index: source/libvpx/vpx_dsp/x86/sad4d_sse2.asm
diff --git a/source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm b/source/libvpx/vpx_dsp/x86/sad4d_sse2.asm
similarity index 98%
rename from source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm
rename to source/libvpx/vpx_dsp/x86/sad4d_sse2.asm
index b4936281f62ec42004d5a6d3db38a82c3ab8385b..0f7fb93d47c7928039480201ff110d88709afb69 100644
--- a/source/libvpx/vp9/encoder/x86/vp9_sad4d_sse2.asm
+++ b/source/libvpx/vpx_dsp/x86/sad4d_sse2.asm
@@ -8,6 +8,8 @@
 ;  be found in the AUTHORS file in the root of the source tree.
 ;
 
+%define program_name vpx
+
 %include "third_party/x86inc/x86inc.asm"
 
 SECTION .text
@@ -167,9 +169,9 @@ SECTION .text
   PROCESS_32x2x4  0, %4, %5, %4 + 32, %5 + 32, %6
 %endmacro
 
-; void vp9_sadNxNx4d_sse2(uint8_t *src,    int src_stride,
+; void vpx_sadNxNx4d_sse2(uint8_t *src,    int src_stride,
 ;                         uint8_t *ref[4], int ref_stride,
-;                         unsigned int res[4]);
+;                         uint32_t res[4]);
 ; where NxN = 64x64, 32x32, 16x16, 16x8, 8x16 or 8x8
 %macro SADNXN4D 2
 %if UNIX64