Fix build with UOA

Conflicts:
	src/empathy-sanity-cleaning.c
	telepathy-account-widgets
	ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
	ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c
	ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c