Merge "Adds support for multi-input kernels to Frameworks/Base/RS."