Merge "Fix expected errno when connecting a UNIX socket to an inet addr."
am: e503f61ebf

Change-Id: Ie11e729fe729720e0308022aec16feaa093e0f2d