ref: 97b4f8fe9299498e1e86c94f91e6dbe2f8b6e574
parent: 28a93d6588ab1ea246bb3aee046ea8e46939de07
parent: eb09bbe88bfdf6ac59477dbadf1a7376d46d95d3
author: James Zern <jzern@google.com>
date: Tue Jun 7 22:56:00 EDT 2016
Merge "Revert "remove vp9_diamond_search_sad_avx.c""