Merge "Delete more unused includes in statsd" into mainline-prod