Sync with debian upstream

since https://github.com/matrix-org/olm/issues/47 now has a proper fix and available in Debian, let's remove the downstream workaround and sync with Debian.

/cc @guido.gunther

/cc @joao.azevedo Can you test chatty running this olm (ie, for telegram and encrypted xmpp and matrix)