[automerger skipped] Merge "Close statsd log socket before zygote fork()." am: b3d2890291 am: cdcf340421
am: 8e36fb0038  -s ours

Change-Id: If50dc61d7b5461bb1dc5ae5ada9ff7cbb0f6d764