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

Change-Id: I372588f4211e47c4cefcbeead176889d41b0fbac