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

Change-Id: I593f2b0dc182d4ca05cc89c855253023c46a3f20