Fix Electron type merging
Fix Electron type merging

This changes to an interface for Electron types so that other layers can merge
in further APIs as needed.

matrix-org/matrix-js-sdk,matrix-org/matrix-js-sdk,matrix-org/matrix-js-sdk,matrix-org/matrix-js-sdk