Merge "statsd: Add AID mappings for iorapd" am: 34bd3dfb39
am: 543c688c3b

Change-Id: I7bbdf54070318e3faa962690bbf214c51682bc37