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