Split Android CaleClient in two different files. (#619)