Merge "[frameworks][base][statsd] fix -Wreorder-init-list"