Merge "Un-Revert "Restore vp8_sixtap_predict4x4_neon""
authorJohann Koenig <johannkoenig@google.com>
Mon, 26 Sep 2016 19:11:00 +0000 (19:11 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 26 Sep 2016 19:11:00 +0000 (19:11 +0000)

Trivial merge