This simplifies the path from rd_pick_intra_sbuv_mode()

Results on Subset1 (compared to  dff41923

 with CfL enabled)

  PSNR | PSNR Cb | PSNR Cr | PSNR HVS |   SSIM | MS SSIM | CIEDE 2000
0.0000 |  0.0000 |  0.0000 |   0.0000 | 0.0000 |  0.0000 |     0.0000

Change-Id: I0bade9d347c626a78ba7077b960afdb318ecca69
Signed-off-by: David Michael Barr <b@rr-dav.id.au>