Merge "LocalSocketImpl.cpp: Set O_CLOEXEC on received FDs" am: 9156ccdbb4 am: 4400fb5bed
am: 7099984f4c

Change-Id: Ie88a0c43d9426c12319cc942015838e46d0bb8a1