libvpx: Pull from upstream

source/libvpx/test/variance_test.cc

Index: source/libvpx/test/variance_test.cc
===================================================================
--- source/libvpx/test/variance_test.cc	(revision 219822)
+++ source/libvpx/test/variance_test.cc	(working copy)
@@ -483,6 +483,7 @@
 #endif
 
 #if HAVE_SSE2
+#if CONFIG_USE_X86INC
 const vp9_variance_fn_t variance4x4_sse2 = vp9_variance4x4_sse2;
 const vp9_variance_fn_t variance4x8_sse2 = vp9_variance4x8_sse2;
 const vp9_variance_fn_t variance8x4_sse2 = vp9_variance8x4_sse2;
@@ -596,8 +597,11 @@
                       make_tuple(6, 5, subpel_avg_variance64x32_sse2),
                       make_tuple(6, 6, subpel_avg_variance64x64_sse2)));
 #endif
+#endif
 
 #if HAVE_SSSE3
+#if CONFIG_USE_X86INC
+
 const vp9_subpixvariance_fn_t subpel_variance4x4_ssse3 =
     vp9_sub_pixel_variance4x4_ssse3;
 const vp9_subpixvariance_fn_t subpel_variance4x8_ssse3 =
@@ -682,6 +686,7 @@
                       make_tuple(6, 5, subpel_avg_variance64x32_ssse3),
                       make_tuple(6, 6, subpel_avg_variance64x64_ssse3)));
 #endif
+#endif
 #endif  // CONFIG_VP9_ENCODER
 
 }  // namespace vp9