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

Change-Id: I4c7780e8f1bcea90a41d0b5b720292602caa8d55