Merge "fs_mgr: overlayfs deal with verity detection issues"