Merge "dumpstate: Track debuggerd API changes."