am cd8df40f: Merge "Revert "Collapse code paths for single- and multi-input kernels.""

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