ruiu accepted this revision. ruiu added a comment. This revision is now accepted and ready to land. LGTM Please mention that this patch fixes the issue when your build path contains '@' character, instead of saying that this is flaky. https://reviews.llvm.org/D37689