Cherry pick "Rename neon convolve avg file"

libvpx_srcs_arm_neon_cpu_detect.gypi

 # This file is generated. Do not edit.
 # Copyright (c) 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'sources': [
     '<(libvpx_source)/vp8/common/alloccommon.c',
     '<(libvpx_source)/vp8/common/alloccommon.h',
     '<(libvpx_source)/vp8/common/arm/armv6/bilinearfilter_v6.asm',
@@ skipping 138 matching lines @@
     '<(libvpx_source)/vp8/encoder/rdopt.c',
     '<(libvpx_source)/vp8/encoder/rdopt.h',
     '<(libvpx_source)/vp8/encoder/segmentation.c',
     '<(libvpx_source)/vp8/encoder/segmentation.h',
     '<(libvpx_source)/vp8/encoder/tokenize.c',
     '<(libvpx_source)/vp8/encoder/tokenize.h',
     '<(libvpx_source)/vp8/encoder/treewriter.c',
     '<(libvpx_source)/vp8/encoder/treewriter.h',
     '<(libvpx_source)/vp8/vp8_cx_iface.c',
     '<(libvpx_source)/vp8/vp8_dx_iface.c',
-    '<(libvpx_source)/vp9/common/arm/neon/vp9_avg_neon_asm.asm',
     '<(libvpx_source)/vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm',
     '<(libvpx_source)/vp9/common/arm/neon/vp9_convolve8_neon_asm.asm',
+    '<(libvpx_source)/vp9/common/arm/neon/vp9_convolve_avg_neon_asm.asm',
     '<(libvpx_source)/vp9/common/arm/neon/vp9_copy_neon_asm.asm',
     '<(libvpx_source)/vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm',
     '<(libvpx_source)/vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm',
     '<(libvpx_source)/vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm',
     '<(libvpx_source)/vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm',
     '<(libvpx_source)/vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm',
     '<(libvpx_source)/vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm',
     '<(libvpx_source)/vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm',
     '<(libvpx_source)/vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm',
     '<(libvpx_source)/vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm',
@@ skipping 185 matching lines @@
     '<(libvpx_source)/vpx_ports/vpx_timer.h',
     '<(libvpx_source)/vpx_scale/generic/gen_scalers.c',
     '<(libvpx_source)/vpx_scale/generic/vpx_scale.c',
     '<(libvpx_source)/vpx_scale/generic/yv12config.c',
     '<(libvpx_source)/vpx_scale/generic/yv12extend.c',
     '<(libvpx_source)/vpx_scale/vpx_scale.h',
     '<(libvpx_source)/vpx_scale/vpx_scale_rtcd.c',
     '<(libvpx_source)/vpx_scale/yv12config.h',
   ],
 }