Fix build issue due to conflicting s64 type definitions (#9064)