Merge "Move creation of /data/user/0 and /data/media/obb to vold"