am 27f734fc: (-s ours) Merge "Revert "Collapse the code paths for single- and multi-input kernels.""

* commit '27f734fc0298fb896651588e6ca0a9124e91a914':
  Revert "Collapse the code paths for single- and multi-input kernels."