Updated nexus-s-4g manifest to ref aosp