Merge ext_interp and dual_filter

Change-Id: I0ebd6951d2b42869ae872b33f63a07db03e99c62
diff --git a/test/av1_convolve_test.cc b/test/av1_convolve_test.cc
index 7e8cb4f..5be2a48 100644
--- a/test/av1_convolve_test.cc
+++ b/test/av1_convolve_test.cc
@@ -137,7 +137,7 @@
   }
 }
 
-#if CONFIG_EXT_INTERP && CONFIG_DUAL_FILTER
+#if CONFIG_DUAL_FILTER
 TEST(AV1ConvolveTest, av1_convolve_vert_first) {
   ACMRandom rnd(ACMRandom::DeterministicSeed());
   InterpFilter interp_filter[4] = { EIGHTTAP_REGULAR, MULTITAP_SHARP,