Merge "Move service-statsd.jar into statsd apex"