Merge commit 'b267fed610c955a115f330692f900776ff123651' as 'third_party/seasocks'

Change-Id: I2041a555446a17ea1a28cf7dbab742c1d8cc0018