Merge pull request #1937 from bradking/dyndep-out-depfile-in

dyndep: reconcile dyndep-specified outputs with depfile-specified inputs