Merge #10953: [Refactor] Combine scriptPubKey and amount as CTxOut in CScriptCheck