Merge "Use a pipe rather than a socketpair to collect debug information from"
am: 14906cd8e9

Change-Id: I6e8622374d62ebba2a72f6abff253669c3b8351e