I've got a the following branch working:
https://github.com/danbev/aerogear-android-sync/tree/client-refactoring

This is using the latest from the aerogear-sync-server refactoring branch:
https://github.com/danbev/aerogear-sync-server/tree/refactoring-spi

I'll assign this to Summers Pittman who is refactoring the xmpp-client.