Merge "fs_mgr: overlayfs support legacy devices (marlin)"