Merge "Refactor vp9_diamond_search_sad function"