Merge "statsd: Add missing AIDs to UidMap" am: 4593c78168 am: df28b82042
am: 9485d2610f

Change-Id: Id5c86477ab2460139d64f5ea7fecd33cc2331128