Merge "remove vp9_diamond_search_sad_avx.c"