Add test triples to fix win32 failures. Revert workaround from r161292.

I don't have a win32 system to test, so hopefully I got them all fixed here.

llvm-svn: 161519