Revert r260669 while the clang-cmake-aarch64-42vma failures is investigated.

There's no obvious reason it should fail in this way but it's the only change
on the blamelist. I suspect stale lit*.cfg's from previous builds.

llvm-svn: 260672