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

Change-Id: I82e5974f96a2a617d31a63813dac22035532c59b