Merge "removed reference to "LLM" and "x8"" into experimental

diff --cc vp9/common/vp9_rtcd_defs.sh
index 911fcc5,3e94185..0c2a5c9
--- 1/vp9/common/vp9_rtcd_defs.sh
--- 2/vp9/common/vp9_rtcd_defs.sh
+++ b/vp9/common/vp9_rtcd_defs.sh
@@@ -598,13 -598,13 +598,13 @@@ prototype void vp9_short_fdct32x32 "int
  specialize vp9_short_fdct32x32
  
  prototype void vp9_short_fdct16x16 "int16_t *InputData, int16_t *OutputData, int pitch"
 -specialize vp9_short_fdct16x16
 +specialize vp9_short_fdct16x16 sse2
  
- prototype void vp9_short_walsh4x4_x8 "int16_t *InputData, int16_t *OutputData, int pitch"
- specialize vp9_short_walsh4x4_x8
+ prototype void vp9_short_walsh4x4 "int16_t *InputData, int16_t *OutputData, int pitch"
+ specialize vp9_short_walsh4x4
  
- prototype void vp9_short_walsh8x4_x8 "int16_t *InputData, int16_t *OutputData, int pitch"
- specialize vp9_short_walsh8x4_x8
+ prototype void vp9_short_walsh8x4 "int16_t *InputData, int16_t *OutputData, int pitch"
+ specialize vp9_short_walsh8x4
  
  #
  # Motion search

diff --cc vp9/decoder/vp9_decodframe.c
Simple merge

diff --cc vp9/encoder/vp9_dct.c
Simple merge

diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge