If argv[0] is version suffixed, e.g. llvm-strip-7, this will still work.
I'm not where I can use phab but the diff and reason for the change look good to me.