Bug 1025034 - Use WCNSS stuff from device rather than backup folder r=mw...

...u