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

* commit 'e47cc8ff93fd5ccf90f5b2acf39d8639fc9adb53':
  Collapse the code paths for single- and multi-input kernels.