Merge "Fix the returned distortion value in rd_pick_intra"