Merge "Revert "Statsd: apex modules in uid map"" into qt-dev am: 8bbabee0cd
am: db43f94d86

Change-Id: I1d6e6762352a10fc4eec41f296f472084822c5ea