Merge "grant mediadrmserver permission to read dir from /system/*" into oc-dev
am: 5f22a4ddff

Change-Id: I2e6160a22c850ddbf3fef6d1e3e6a82dcf18db89