Remove search_v2 flag

Change-Id: I606111f510d2d44276aac2e71fdc5e87b0e2babe
Fixes: 69851037
Test: rebuild
1 file changed