Merge "kernel: allow write access to /data/misc/vold/virtual_disk"