Revert "libvpx: Pull from upstream"

libvpx_srcs_arm_neon_cpu_detect_intrinsics.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.
 
 {
   'targets': [
     {
       'target_name': 'libvpx_intrinsics_neon',
       'type': 'static_library',
@@ skipping 25 matching lines @@
         '<(libvpx_source)/vp8/encoder/arm/neon/fastquantizeb_neon.c',
         '<(libvpx_source)/vp8/encoder/arm/neon/shortfdct_neon.c',
         '<(libvpx_source)/vp8/encoder/arm/neon/subtract_neon.c',
         '<(libvpx_source)/vp8/encoder/arm/neon/vp8_mse16x16_neon.c',
         '<(libvpx_source)/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c',
         '<(libvpx_source)/vp9/common/arm/neon/vp9_convolve_neon.c',
         '<(libvpx_source)/vp9/common/arm/neon/vp9_idct16x16_neon.c',
         '<(libvpx_source)/vp9/common/arm/neon/vp9_iht4x4_add_neon.c',
         '<(libvpx_source)/vp9/common/arm/neon/vp9_iht8x8_add_neon.c',
         '<(libvpx_source)/vp9/common/arm/neon/vp9_loopfilter_neon.c',
-        '<(libvpx_source)/vp9/encoder/arm/neon/vp9_avg_neon.c',
         '<(libvpx_source)/vp9/encoder/arm/neon/vp9_dct_neon.c',
         '<(libvpx_source)/vp9/encoder/arm/neon/vp9_quantize_neon.c',
-        '<(libvpx_source)/vp9/encoder/arm/neon/vp9_sad4d_neon.c',
         '<(libvpx_source)/vp9/encoder/arm/neon/vp9_sad_neon.c',
         '<(libvpx_source)/vp9/encoder/arm/neon/vp9_subtract_neon.c',
         '<(libvpx_source)/vp9/encoder/arm/neon/vp9_variance_neon.c',
       ],
       'cflags!': [ '-mfpu=vfpv3-d16' ],
       'conditions': [
         # Disable LTO in neon targets due to compiler bug
         # crbug.com/408997
         ['use_lto==1', {
           'cflags!': [
             '-flto',
             '-ffat-lto-objects',
           ],
         }],
       ],
       'cflags': [ '-mfpu=neon', ],
       'xcode_settings': { 'OTHER_CFLAGS': [ '-mfpu=neon' ] },
     },
   ],
 }