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

Change-Id: Ie61645bd9b276f67e96ac7f823c1a1048a35ef8e