Merge "Clean up framework-statsd"