AV1 RT: Switch to pruned sub-pel search

0.11% BDRate loss on speed 7 lowres and 0.04% on midres. Less loss on
speed 8. 2-3% speedup on speed7 lowres

Change-Id: Ib8dd95b6fe0df0c3689c477944b5c0c70ec21dce
diff --git a/av1/encoder/nonrd_pickmode.c b/av1/encoder/nonrd_pickmode.c
index 19426a6..9a1fc14 100644
--- a/av1/encoder/nonrd_pickmode.c
+++ b/av1/encoder/nonrd_pickmode.c
@@ -1499,7 +1499,6 @@
   }
 
   av1_collect_neighbors_ref_counts(xd);
-  av1_count_overlappable_neighbors(cm, xd);
 
   estimate_single_ref_frame_costs(cm, xd, x, segment_id, ref_costs_single);
   if (cpi->sf.rt_sf.use_comp_ref_nonrd)
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 5644c8e..2adb00e 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -836,7 +836,7 @@
 
     sf->mv_sf.search_method = FAST_DIAMOND;
     sf->mv_sf.subpel_force_stop = QUARTER_PEL;
-    sf->mv_sf.subpel_search_method = SUBPEL_TREE;
+    sf->mv_sf.subpel_search_method = SUBPEL_TREE_PRUNED;
 
     sf->inter_sf.inter_mode_rd_model_estimation = 2;