Include 2 upstream patches to fix build issues with i686 and issues with s390x builds. Resolves: #rhbz1981316