Merge pull request #22283 from jefferyto/python-cffi-1.16.0