Merge "Cleaning up vp9_full_search_sadx3()."