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

Change-Id: I6fc348d92767358382217627402afc7d42bd3d2d