Merge "vp9: neon: add vp9_convolve_avg_neon"

diff --cc vp9/common/vp9_rtcd_defs.sh
Simple merge

diff --cc vp9/vp9_common.mk
index d6c70dc3c5e5ef74e1d9977b1debfec73f586381,e4bf4f4e1022426d8b5ea5e3adab3bc71a67aaab..c6f398101afdc3fe18f37ebaf799878b06de6369
--- 1/vp9/vp9_common.mk
--- 2/vp9/vp9_common.mk
+++ b/vp9/vp9_common.mk
@@@ -98,8 -97,8 +98,9 @@@ VP9_COMMON_SRCS-$(HAVE_NEON) += common/
  VP9_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_dc_only_idct_add_neon$(ASM)
  VP9_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_short_idct4x4_add_neon$(ASM)
  VP9_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_short_idct8x8_add_neon$(ASM)
 +VP9_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_short_idct16x16_add_neon$(ASM)
  VP9_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_mb_lpf_neon$(ASM)
  VP9_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_copy_neon$(ASM)
+ VP9_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_avg_neon$(ASM)
  
  $(eval $(call rtcd_h_template,vp9_rtcd,vp9/common/vp9_rtcd_defs.sh))