Merge "Move statscompanion to statsd-service jar"