Merge "Statsd: apex modules in uid map" into qt-dev
am: a36325306a

Change-Id: Ibd1326896b0c0ec12692334b6a847f9bebd328ac