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

Change-Id: I05214262704a572a4645df427a76227f8d9eeac4