Merge "Revert "Migrate Statsd to the apex""