Merge "vp9: remove x86inc.asm distinction"
authorJohann Koenig <johannkoenig@google.com>
Thu, 30 Jun 2016 17:42:17 +0000 (17:42 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 30 Jun 2016 17:42:17 +0000 (17:42 +0000)

Trivial merge