Merge "Fix possibly uninitialized access to strideIn, and turn on -Werror." am: d142ace
am: e9e973e

* commit 'e9e973e34738ecb58ab21f0adf47583384a4affd':
  Fix possibly uninitialized access to strideIn, and turn on -Werror.