Merge changes I3ba75c45,I97d26285
authorJames Zern <jzern@google.com>
Wed, 6 Jun 2018 04:54:41 +0000 (04:54 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 6 Jun 2018 04:54:41 +0000 (04:54 +0000)
* changes:
  force-inline the convolve functions
  Unbreak the force inline directive for gcc


Trivial merge