Merge "Rename more things in statsd_config.proto."