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

Change-Id: I7db94b8c6207ce559596945f4933ecba0e9abf4e