Merge "Code clean of highbd_tm_predictor_4x4"

diff --cc test/vp9_intrapred_test.cc
Simple merge

diff --cc vpx_dsp/vpx_dsp_rtcd_defs.pl
index 23065df,04c4b73..a2a0674
--- 1/vpx_dsp/vpx_dsp_rtcd_defs.pl
--- 2/vpx_dsp/vpx_dsp_rtcd_defs.pl
+++ b/vpx_dsp/vpx_dsp_rtcd_defs.pl
@@@ -288,13 -288,13 +288,13 @@@ if (vpx_config("CONFIG_VP9_HIGHBITDEPTH
    specialize qw/vpx_highbd_d153_predictor_4x4/;
  
    add_proto qw/void vpx_highbd_v_predictor_4x4/, "uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd";
 -  specialize qw/vpx_highbd_v_predictor_4x4/, "$sse_x86inc";
 +  specialize qw/vpx_highbd_v_predictor_4x4/, "$sse2_x86inc";
  
    add_proto qw/void vpx_highbd_tm_predictor_4x4/, "uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd";
-   specialize qw/vpx_highbd_tm_predictor_4x4/, "$sse_x86inc";
+   specialize qw/vpx_highbd_tm_predictor_4x4/, "$sse2_x86inc";
  
    add_proto qw/void vpx_highbd_dc_predictor_4x4/, "uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd";
 -  specialize qw/vpx_highbd_dc_predictor_4x4/, "$sse_x86inc";
 +  specialize qw/vpx_highbd_dc_predictor_4x4/, "$sse2_x86inc";
  
    add_proto qw/void vpx_highbd_dc_top_predictor_4x4/, "uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd";
    specialize qw/vpx_highbd_dc_top_predictor_4x4/;

diff --cc vpx_dsp/x86/highbd_intrapred_sse2.asm
Simple merge