Merge "Migrate apex/statsd -> packages/modules/StatsD/apex"