Merge "libdebuggerd: cleanup."