Enable GPS XTRA servers

Change-Id: Id918728e2c6364088c02327999e3f623bdf42c05
Switch to TimeService blobs

Change-Id: I64b6a147f66459a8a348cc02a4cf00e9aad34fd7

Conflicts:
	setup-makefiles.sh