Fix for build test for BuildWithDepsLogTest.RestatMissingDepfileDepslog
Merge pull request #654 from rgeary1/buildTestFix

Fix for build test for BuildWithDepsLogTest.RestatMissingDepfileDepslog
Simplify.
Merge pull request #655 from nico/simp

Simplify.