Merge "Handle EINTR from sendmsg/recvmsg" into oc-dev am: 1df013c3ef
am: 3961b0e53a

Change-Id: I44819c2a7ebc1b40b462a17e24cd575ad92b919a