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

Change-Id: I38f9e15e7ee0a9f071fcf5d208bd49b68ff26e69