Bug 1002041 - Fix non-ion build failures from 716647. r=shu