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

Change-Id: I20e648b5e0885a90ee0fa4a089ba607c4cce4c20