Merge "debuggerd: a few generic improvements"