Use Android's Base64 implementation when on Android, otherwise, when on Java7, use the existing one.
and move RosterStore and DirectoryRosterStore into it.