Merge "Revert "Remove Wextra warnings from vp9_sad.c""