Merge "android_filesystem_config add AID for iorapd"
am: ca2d62e1e7

Change-Id: I2b7c2b62b47eda6d9f5456a0357508b12435bec1