Merge "fs_mgr: move mkdir(mount_point) to prepare_fs_for_mount()"