Unify nexus-s-uicc with nexus-s. They now have the same repos, except the crespo device/kernel, and hardware-ril.

Change-Id: Ia3d3549eed28479c82cf431d183519d5f01d841b