[Bug 656599] Make the build script dependency resolver behave like the build service one