Merge "Revert "Add AVX vectorized vp9_diamond_search_sad""