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

Change-Id: I03c3e7a79d96840ebbaccf9f00ac2e02e8f87b11