Merge "storage: fix vold selinux error"