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

Change-Id: I51f4badb23a73e826334e98e7b3e38d01df7d6c5