Adjust speed features

This reverts commit a66ded7a0c796feed3225fd3ae6df5c9e812b384.
Test showed the quality/speed trade off isn't good.

STATS_CHANGED

Change-Id: Ia971cac3bcd430011a63ce90b0b52472c0e942a4
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index e0af88e..696021b 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -448,8 +448,6 @@
       sf->inter_sf.disable_smooth_interintra = boosted ? 0 : 1;
     sf->inter_sf.reuse_compound_type_decision = 1;
 
-    sf->interp_sf.cb_pred_filter_search = 1;
-
     sf->intra_sf.prune_palette_search_level = 2;
 
     sf->tpl_sf.skip_alike_starting_mv = 2;
@@ -495,6 +493,7 @@
     sf->inter_sf.selective_ref_frame = 4;
     sf->inter_sf.disable_smooth_interintra = 1;
 
+    sf->interp_sf.cb_pred_filter_search = 1;
     sf->interp_sf.skip_sharp_interp_filter_search = 1;
     sf->interp_sf.use_interp_filter = 2;
     sf->interp_sf.adaptive_interp_filter_search = 2;