Merge "Refactor ZygoteProcess to deal in LocalSocketAddress." am: 9fda81e274 am: 9b13db0938
am: 1bb6046a06  -s ours

Change-Id: I2d4378406be9341a55135e09749b2335321c40de