Merge "Pass RsExpandKernelDriverInfo not RsExpandKernelParams."