Merge "fs_mgr: overlayfs_mount_scratch don't write to system_other"