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

Change-Id: I7ececbf5b5a5e2f0f09e7f7fbb161e8676793f0b