Cleanup remnants of CONFIG_INTRA_EDGE macro

Change-Id: Ic0375261004b97bd2c900a29c0e6c04d7c6eb663
diff --git a/av1/av1.cmake b/av1/av1.cmake
index 64ea170..0d4e58b 100644
--- a/av1/av1.cmake
+++ b/av1/av1.cmake
@@ -417,11 +417,9 @@
       "${AOM_ROOT}/av1/encoder/pickrst.c"
       "${AOM_ROOT}/av1/encoder/pickrst.h")
 
-if (CONFIG_INTRA_EDGE)
   set(AOM_AV1_COMMON_INTRIN_SSE4_1
       ${AOM_AV1_COMMON_INTRIN_SSE4_1}
       "${AOM_ROOT}/av1/common/x86/intra_edge_sse4.c")
-endif ()
 
 set(AOM_AV1_COMMON_INTRIN_SSE4_1
     ${AOM_AV1_COMMON_INTRIN_SSE4_1}
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index ed34834..3766481 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -109,7 +109,6 @@
 set(CONFIG_FWD_KF 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_HASH_ME 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_INTER_STATS_ONLY 0 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_INTRA_EDGE 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_INTRA_EDGE2 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_JNT_COMP 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_LOOPFILTERING_ACROSS_TILES 1 CACHE NUMBER "AV1 experiment flag.")