Merge "Close statsd log socket before zygote fork()." am: b3d2890291
am: cdcf340421

Change-Id: I7e56dadb11ad2a0c4bd0ba55d918c3308ae8dc8a