Bug 1113308 - Further fixes for Windows builds via autospider.sh, r=terrence

--HG--
extra : rebase_source : c18239800e95ec9837fdf5334675abe9744cd2ed