[CFL] New UV_PREDICTION_MODE for CFL

CfL is now an independent mode.

Results on Subset1 (Compared to 4266a7ed with CFL enabled)

   PSNR | PSNR Cb | PSNR Cr | PSNR HVS |    SSIM | MS SSIM | CIEDE 2000
-0.1645 | -0.4017 |  0.2475 |  -0.1851 | -0.2179 | -0.2338 |    -0.2897

Change-Id: I2e86e7ea7bfc12bb1d763e70a136ca992d57a3c5
diff --git a/examples/inspect.c b/examples/inspect.c
index e5c2871..1056af2 100644
--- a/examples/inspect.c
+++ b/examples/inspect.c
@@ -221,16 +221,22 @@
 
 #if CONFIG_CFL
 const map_entry uv_prediction_mode_map[] = {
-  ENUM(UV_DC_PRED),       ENUM(UV_V_PRED),        ENUM(UV_H_PRED),
-  ENUM(UV_D45_PRED),      ENUM(UV_D135_PRED),     ENUM(UV_D117_PRED),
-  ENUM(UV_D153_PRED),     ENUM(UV_D207_PRED),     ENUM(UV_D63_PRED),
+  ENUM(UV_DC_PRED),       ENUM(UV_V_PRED),
+  ENUM(UV_H_PRED),        ENUM(UV_D45_PRED),
+  ENUM(UV_D135_PRED),     ENUM(UV_D117_PRED),
+  ENUM(UV_D153_PRED),     ENUM(UV_D207_PRED),
+  ENUM(UV_D63_PRED),
 #if CONFIG_ALT_INTRA
   ENUM(UV_SMOOTH_PRED),
 #if CONFIG_SMOOTH_HV
   ENUM(UV_SMOOTH_V_PRED), ENUM(UV_SMOOTH_H_PRED),
 #endif  // CONFIG_SMOOTH_HV
 #endif  // CONFIG_ALT_INTRA
-  ENUM(UV_TM_PRED),       ENUM(UV_MODE_INVALID),  LAST_ENUM
+  ENUM(UV_TM_PRED),
+#if CONFIG_CFL
+  ENUM(UV_CFL_PRED),
+#endif
+  ENUM(UV_MODE_INVALID),  LAST_ENUM
 };
 #else
 #define uv_prediction_mode_map prediction_mode_map