Another speculative commit to try to fix Polly's build. This is more delta than

I like to make w/o being able to build, but I don't have the dependencies to
build and test polly. I'll revert if the build bots don't like it.

llvm-svn: 166670