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

Change-Id: I09d92b0383a3f37969978cbf5dea8b7135c304ee