Merge "minadbd: Fix a failing test due to SIGPIPE."
am: 7b1fffe095

Change-Id: I0feb7529e596a201fb0d683e5054d2b1b4227c1d