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