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

Make tests not depend on grep supporting -bo.