Merge "libdebuggerd: cleanup." am: 2b8a95a2a7
am: 8577f499b6

Change-Id: I5f45f0a1466685d53f2e1ad0e0f6e3b95fd8598d