Merge "fs_mgr_overlayfs: Remove backing image if failed to allocate scratch"