Revert rL215947: "[clang-rename] revert r215839"

Make tests not depend on grep supporting -bo.

git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@216041 91177308-0d34-0410-b5e6-96231b3b80d8