Merge "Add back bionic SIGPIPE handler workaround accidentally removed in 3b51a07e478d" am: 5fb9bd50fb
am: 9242133fd0

Change-Id: Ifcb87ec1bc9e94cd6f447427fc0f062cd42df372