bring back spyder and umts spyder

Change-Id: Ieb0b02824aeddf270264014519e6cc16375bf900
Merge "bring back spyder and umts spyder" into pac-4.4