Merge "Remove uses of depfile in gensrcs modules"