Merge "statsd: Add missing AIDs to UidMap"