Merge changes I95159bcb,Ia74e3097,I661f6439
authorJames Zern <jzern@google.com>
Sat, 27 Feb 2016 02:56:40 +0000 (02:56 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Sat, 27 Feb 2016 02:56:41 +0000 (02:56 +0000)
* changes:
  x86/convolve.h: remove redundant check in FUN_CONV_2D
  x86/convolve.h: replace while w/if for w < 16
  x86/convolve.h: change filter[] || chains to |


Trivial merge