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

Change-Id: Ida7fc9c7f7e01d6993361c0734f71d1d13d97158