Merge "statsd: fix double close." am: 0b8f17b3ba am: 6547dad5ac
am: 86b0140271

Change-Id: I0377db4c1e5343355882e1cfea94d7e4d04159d1