Merge two macros

CONFIG_INTRA_EDGE_UPSAMPLE is always defined as CONFIG_INTRA_EDGE, so
this commit merges them into one single macro.

Change-Id: I69ae484827f4203fbf68f6a26ae5a8f9c051162d

av1/common/reconintra.h

@@ -45,13 +45,12 @@ static const INTERINTRA_MODE intra_to_interintra_mode[INTRA_MODES] = {
 #define FILTER_INTRA_SCALE_BITS 4
 #endif  // CONFIG_FILTER_INTRA
 
-#define CONFIG_INTRA_EDGE_UPSAMPLE CONFIG_INTRA_EDGE
 #define CONFIG_USE_ANGLE_DELTA_SUB8X8 0
 
 #if CONFIG_EXT_INTRA
 static INLINE int av1_is_directional_mode(PREDICTION_MODE mode,
                                           BLOCK_SIZE bsize) {
-#if CONFIG_INTRA_EDGE_UPSAMPLE
+#if CONFIG_INTRA_EDGE
   (void)bsize;
   return mode >= V_PRED && mode <= D63_PRED;
 #else