libvpx: Pull from upstream

source/libvpx/vpx_dsp/arm/sad4d_neon.c

Index: source/libvpx/vpx_dsp/arm/sad4d_neon.c
diff --git a/source/libvpx/vp9/encoder/arm/neon/vp9_sad4d_neon.c b/source/libvpx/vpx_dsp/arm/sad4d_neon.c
similarity index 96%
rename from source/libvpx/vp9/encoder/arm/neon/vp9_sad4d_neon.c
rename to source/libvpx/vpx_dsp/arm/sad4d_neon.c
index cec1689f1f9c289f0e42ef9cf0e8e32e78fce774..c7704dc1be67266995b6e117adba5248f53307b3 100644
--- a/source/libvpx/vp9/encoder/arm/neon/vp9_sad4d_neon.c
+++ b/source/libvpx/vpx_dsp/arm/sad4d_neon.c
@@ -9,9 +9,9 @@
  */
 
 #include <arm_neon.h>
-#include "./vp9_rtcd.h"
-#include "./vpx_config.h"
 
+#include "./vpx_config.h"
+#include "./vpx_dsp_rtcd.h"
 #include "vpx/vpx_integer.h"
 
 static INLINE unsigned int horizontal_long_add_16x8(const uint16x8_t vec_lo,
@@ -80,9 +80,9 @@ static void sad_neon_32(const uint8x16_t vec_src_00,
                              vget_high_u8(vec_ref_16));
 }
 
-void vp9_sad64x64x4d_neon(const uint8_t *src, int src_stride,
+void vpx_sad64x64x4d_neon(const uint8_t *src, int src_stride,
                           const uint8_t* const ref[4], int ref_stride,
-                          unsigned int *res) {
+                          uint32_t *res) {
   int i;
   uint16x8_t vec_sum_ref0_lo = vdupq_n_u16(0);
   uint16x8_t vec_sum_ref0_hi = vdupq_n_u16(0);
@@ -126,9 +126,9 @@ void vp9_sad64x64x4d_neon(const uint8_t *src, int src_stride,
   res[3] = horizontal_long_add_16x8(vec_sum_ref3_lo, vec_sum_ref3_hi);
 }
 
-void vp9_sad32x32x4d_neon(const uint8_t *src, int src_stride,
+void vpx_sad32x32x4d_neon(const uint8_t *src, int src_stride,
                           const uint8_t* const ref[4], int ref_stride,
-                          unsigned int *res) {
+                          uint32_t *res) {
   int i;
   uint16x8_t vec_sum_ref0_lo = vdupq_n_u16(0);
   uint16x8_t vec_sum_ref0_hi = vdupq_n_u16(0);
@@ -170,9 +170,9 @@ void vp9_sad32x32x4d_neon(const uint8_t *src, int src_stride,
   res[3] = horizontal_long_add_16x8(vec_sum_ref3_lo, vec_sum_ref3_hi);
 }
 
-void vp9_sad16x16x4d_neon(const uint8_t *src, int src_stride,
+void vpx_sad16x16x4d_neon(const uint8_t *src, int src_stride,
                           const uint8_t* const ref[4], int ref_stride,
-                          unsigned int *res) {
+                          uint32_t *res) {
   int i;
   uint16x8_t vec_sum_ref0_lo = vdupq_n_u16(0);
   uint16x8_t vec_sum_ref0_hi = vdupq_n_u16(0);