Merge "Delete obsolete debuggerd references."
am: 1193f3bff6

Change-Id: I025b3c707785c9979515d545ef74eefe6eb9bc90