Merge changes I43521ad3,I013659f6

* changes:
  satd highbd neon: use tran_low_t for coeff
  satd highbd sse2: use tran_low_t for coeff

diff --cc vpx_dsp/vpx_dsp_rtcd_defs.pl
index d23a5e7bf389f762101b419aec83d967611d9fa0,95a5c39fe2085cb68184061b259ba755f10e534b..d63d549252ea92a754bb1450ef85f8085abaa51a
--- 1/vpx_dsp/vpx_dsp_rtcd_defs.pl
--- 2/vpx_dsp/vpx_dsp_rtcd_defs.pl
+++ b/vpx_dsp/vpx_dsp_rtcd_defs.pl
@@@ -888,13 -888,13 +888,13 @@@ if (vpx_config("CONFIG_VP9_ENCODER") e
  
    if (vpx_config("CONFIG_VP9_HIGHBITDEPTH") eq "yes") {
      add_proto qw/void vpx_hadamard_8x8/, "const int16_t *src_diff, int src_stride, tran_low_t *coeff";
 -    specialize qw/vpx_hadamard_8x8/;
 +    specialize qw/vpx_hadamard_8x8 sse2 neon/, "$ssse3_x86_64";
  
      add_proto qw/void vpx_hadamard_16x16/, "const int16_t *src_diff, int src_stride, tran_low_t *coeff";
 -    specialize qw/vpx_hadamard_16x16/;
 +    specialize qw/vpx_hadamard_16x16 sse2 neon/;
  
      add_proto qw/int vpx_satd/, "const tran_low_t *coeff, int length";
-     specialize qw/vpx_satd/;
+     specialize qw/vpx_satd sse2 neon/;
    } else {
      add_proto qw/void vpx_hadamard_8x8/, "const int16_t *src_diff, int src_stride, int16_t *coeff";
      specialize qw/vpx_hadamard_8x8 sse2 neon msa/, "$ssse3_x86_64";

diff --cc vpx_dsp/x86/avg_intrin_sse2.c
Simple merge