Merge "Revert "Split TeleService into a client apk and a lib.""