Merge "Allow vold to mount at /mnt/user/.*"