Merge "Remove dead code that looked like part of debuggerd."