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

Change-Id: I69ae484827f4203fbf68f6a26ae5a8f9c051162d