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

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