libvpx: Pull from upstream

libvpx_srcs_arm_neon.gypi

Index: libvpx_srcs_arm_neon.gypi
diff --git a/libvpx_srcs_arm_neon.gypi b/libvpx_srcs_arm_neon.gypi
index 277180640ded13dbc39d9c087c60f4dd145a7d82..81e03e049b268c23a288b088b9238bb8bcb3419b 100644
--- a/libvpx_srcs_arm_neon.gypi
+++ b/libvpx_srcs_arm_neon.gypi
@@ -22,8 +22,6 @@
     '<(libvpx_source)/vp8/common/arm/armv6/loopfilter_v6.asm',
     '<(libvpx_source)/vp8/common/arm/armv6/simpleloopfilter_v6.asm',
     '<(libvpx_source)/vp8/common/arm/armv6/sixtappredict8x4_v6.asm',
-    '<(libvpx_source)/vp8/common/arm/armv6/vp8_variance16x16_armv6.asm',
-    '<(libvpx_source)/vp8/common/arm/armv6/vp8_variance8x8_armv6.asm',
     '<(libvpx_source)/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm',
     '<(libvpx_source)/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm',
     '<(libvpx_source)/vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm',
@@ -48,7 +46,6 @@
     '<(libvpx_source)/vp8/common/arm/neon/reconintra_neon.c',
     '<(libvpx_source)/vp8/common/arm/neon/shortidct4x4llm_neon.c',
     '<(libvpx_source)/vp8/common/arm/neon/sixtappredict_neon.c',
-    '<(libvpx_source)/vp8/common/arm/neon/variance_neon.c',
     '<(libvpx_source)/vp8/common/arm/neon/vp8_subpixelvariance_neon.c',
     '<(libvpx_source)/vp8/common/arm/variance_arm.c',
     '<(libvpx_source)/vp8/common/blockd.c',
@@ -121,7 +118,6 @@
     '<(libvpx_source)/vp8/decoder/onyxd_int.h',
     '<(libvpx_source)/vp8/decoder/threading.c',
     '<(libvpx_source)/vp8/decoder/treereader.h',
-    '<(libvpx_source)/vp8/encoder/arm/armv6/vp8_mse16x16_armv6.asm',
     '<(libvpx_source)/vp8/encoder/arm/armv6/vp8_short_fdct4x4_armv6.asm',
     '<(libvpx_source)/vp8/encoder/arm/armv6/walsh_v6.asm',
     '<(libvpx_source)/vp8/encoder/arm/dct_arm.c',
@@ -129,7 +125,6 @@
     '<(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)/vp8/encoder/bitstream.c',
     '<(libvpx_source)/vp8/encoder/bitstream.h',
@@ -200,6 +195,7 @@
     '<(libvpx_source)/vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm',
     '<(libvpx_source)/vp9/common/arm/neon/vp9_loopfilter_neon.c',
     '<(libvpx_source)/vp9/common/arm/neon/vp9_mb_lpf_neon.asm',
+    '<(libvpx_source)/vp9/common/arm/neon/vp9_reconintra_neon.c',
     '<(libvpx_source)/vp9/common/arm/neon/vp9_reconintra_neon_asm.asm',
     '<(libvpx_source)/vp9/common/arm/neon/vp9_save_reg_neon.asm',
     '<(libvpx_source)/vp9/common/vp9_alloccommon.c',
@@ -379,7 +375,10 @@
     '<(libvpx_source)/vpx_dsp/arm/sad4d_neon.c',
     '<(libvpx_source)/vpx_dsp/arm/sad_media.asm',
     '<(libvpx_source)/vpx_dsp/arm/sad_neon.c',
+    '<(libvpx_source)/vpx_dsp/arm/variance_media.asm',
+    '<(libvpx_source)/vpx_dsp/arm/variance_neon.c',
     '<(libvpx_source)/vpx_dsp/sad.c',
+    '<(libvpx_source)/vpx_dsp/variance.c',
     '<(libvpx_source)/vpx_dsp/vpx_dsp_rtcd.c',
     '<(libvpx_source)/vpx_mem/include/vpx_mem_intrnl.h',
     '<(libvpx_source)/vpx_mem/vpx_mem.c',
@@ -390,6 +389,7 @@
     '<(libvpx_source)/vpx_ports/mem.h',
     '<(libvpx_source)/vpx_ports/mem_ops.h',
     '<(libvpx_source)/vpx_ports/mem_ops_aligned.h',
+    '<(libvpx_source)/vpx_ports/msvc.h',
     '<(libvpx_source)/vpx_ports/vpx_once.h',
     '<(libvpx_source)/vpx_ports/vpx_timer.h',
     '<(libvpx_source)/vpx_scale/generic/gen_scalers.c',