Merge branch 'backport-IntelLLVM-depfile-flags' into IntelLLVM-depfile-flags