Merge "dumpstate: Track debuggerd API changes." am: ccc5db441b
am: 62b9a75c4c

Change-Id: Id1320f3373a4bbcdcfd945ea9299bd8a805adc12