Merge "fs_mgr: overlayfs unit test"