Merge "Revert "Statsd: apex modules in uid map"" into qt-dev