Differential Revision: https://reviews.llvm.org/D37717 llvm-svn: 312972
This should bring the arm buildbots back. llvm-svn: 205502