Merge "StatsD: Add res_statsd compatibility"