Partially revert r184225 test changes and make a smaller and more generic fix.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@184232 91177308-0d34-0410-b5e6-96231b3b80d8