bring back pollux & pollux_windy

p2: removed ghost to make separate commit -- don't want to mix devices.

Change-Id: Iccecc5aa28e94342b6818c874ff035fd1d2df65a
Merge "bring back pollux & pollux_windy" into pac-4.4