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

Change-Id: I69abdad7e2e0feeeab9947b196a90f72299fa1eb