Merge "android_filesystem_config add AID for iorapd" am: ca2d62e1e7
am: 50f298817e

Change-Id: I28732965fe3ebf82bff0e641c9b84bfe0fdbe848