Merge "Revert "remove vp9_diamond_search_sad_avx.c""
authorJames Zern <jzern@google.com>
Wed, 8 Jun 2016 02:56:00 +0000 (02:56 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 8 Jun 2016 02:56:00 +0000 (02:56 +0000)

Trivial merge