Merge changes from topic 'missing-proto'
authorJames Zern <jzern@google.com>
Fri, 15 May 2015 17:17:12 +0000 (17:17 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 15 May 2015 17:17:13 +0000 (17:17 +0000)
* changes:
  sad*_avx2.c: sync function signatures
  vpx_scale: add missing rtcd + vpx_scale includes


Trivial merge