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

Change-Id: Ide43a91ee1352b47180758708e0188f3ef1af6d7