Fix Valgrind error from WRAP_AVX2/ConvolveTest.Copy

WRAP_AVX2 didnot excluded by Google Test filter.

BUG=aomedia:2029

Change-Id: I3985820f192b10e9eaa2a1c90d4c2ddbcb11af15

test/convolve_test.cc

diff --git a/test/convolve_test.cc b/test/convolve_test.cc
index 8725bd9..de3f476 100644
--- a/test/convolve_test.cc
+++ b/test/convolve_test.cc
@@ -836,11 +836,6 @@
                                        aom_convolve8_horiz_avx2,
                                        aom_convolve8_vert_avx2, 0);
 
-const ConvolveParam kArrayConvolve8_avx2[] = { ALL_SIZES(convolve8_avx2) };
-INSTANTIATE_TEST_CASE_P(AVX2, ConvolveTest,
-                        ::testing::ValuesIn(kArrayConvolve8_avx2));
-#endif
-#if HAVE_AVX2
 const ConvolveFunctions wrap_convolve8_avx2(wrap_convolve_copy_avx2_8,
                                             wrap_convolve8_horiz_avx2_8,
                                             wrap_convolve8_vert_avx2_8, 8);
@@ -850,12 +845,12 @@
 const ConvolveFunctions wrap_convolve12_avx2(wrap_convolve_copy_avx2_12,
                                              wrap_convolve8_horiz_avx2_12,
                                              wrap_convolve8_vert_avx2_12, 12);
-const ConvolveParam kArray_wrap_Convolve8_avx2[] = {
+const ConvolveParam kArray_Convolve8_avx2[] = {
   ALL_SIZES_64(wrap_convolve8_avx2), ALL_SIZES_64(wrap_convolve10_avx2),
-  ALL_SIZES_64(wrap_convolve12_avx2)
+  ALL_SIZES_64(wrap_convolve12_avx2), ALL_SIZES(convolve8_avx2)
 };
-INSTANTIATE_TEST_CASE_P(WRAP_AVX2, ConvolveTest,
-                        ::testing::ValuesIn(kArray_wrap_Convolve8_avx2));
+INSTANTIATE_TEST_CASE_P(AVX2, ConvolveTest,
+                        ::testing::ValuesIn(kArray_Convolve8_avx2));
 #endif  // HAVE_AVX2
 
 }  // namespace