Merge "statsd: Add AID mappings for iorapd"