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

Change-Id: If99bb83fbd4a9a5c533269ffc21995e0206d78a3