Merge "Update statsd_config.proto."