Merge "[automerger skipped] Merge "Migrate apex/statsd -> packages/modules/StatsD/apex" into mainline-prod am: 1494354a -s ours"