Merge "statsd: fix -Wreorder-init-list"