Merge "dumpstate: declare dependencies on external tools."
am: b46d97b94e

Change-Id: I752512df3e9d9643ae0b63a4093bb208a03a1bab