Add two patches related to .pyi files.

- Backport upstream fix for handling of sip.pyi.
- Partially backport upstream SIP v6 change to create a PEP 561 py.typed
  file if dunder-init is specified and at least one set of bindings has
  pep484-pyi specified (see #978586).