Merge branch 'backport-3.21-makefile-normalize-depfile'