Merge "dumpstate: declare dependencies on external tools."